summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexey Samsonov <samsonov@google.com>2014-02-14 11:00:07 +0000
committerAlexey Samsonov <samsonov@google.com>2014-02-14 11:00:07 +0000
commite1c4400a92b57ecf62abb892da2a8a0a3be43600 (patch)
treeb454fe437d46bd919e9eb7bce2bc32ea957015ae
parentea9eb19ec0fea9d387bfe41bb187efd4a1a52fd5 (diff)
Move shared configs for lit test suites to test/ and unittests/ directories
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@201399 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--CMakeLists.txt6
-rw-r--r--lib/CMakeLists.txt10
-rw-r--r--lib/asan/lit_tests/GenericConfig/lit.site.cfg.in2
-rw-r--r--lib/asan/lit_tests/Unit/lit.site.cfg.in2
-rw-r--r--lib/dfsan/lit_tests/lit.site.cfg.in2
-rw-r--r--lib/lsan/lit_tests/AsanConfig/lit.site.cfg.in2
-rw-r--r--lib/lsan/lit_tests/LsanConfig/lit.site.cfg.in2
-rw-r--r--lib/lsan/lit_tests/Unit/lit.site.cfg.in2
-rw-r--r--lib/msan/lit_tests/Unit/lit.site.cfg.in2
-rw-r--r--lib/msan/lit_tests/lit.site.cfg.in2
-rw-r--r--lib/sanitizer_common/tests/lit.site.cfg.in2
-rw-r--r--lib/tsan/lit_tests/Unit/lit.site.cfg.in2
-rw-r--r--lib/tsan/lit_tests/lit.site.cfg.in2
-rw-r--r--lib/ubsan/lit_tests/AsanConfig/lit.site.cfg.in2
-rw-r--r--lib/ubsan/lit_tests/UbsanConfig/lit.site.cfg.in2
-rw-r--r--test/CMakeLists.txt7
-rw-r--r--test/lit.common.cfg (renamed from lib/lit.common.cfg)0
-rw-r--r--test/lit.common.configured.in (renamed from lib/lit.common.configured.in)2
-rw-r--r--unittests/CMakeLists.txt3
-rw-r--r--unittests/lit.common.unit.cfg (renamed from lib/lit.common.unit.cfg)0
-rw-r--r--unittests/lit.common.unit.configured.in (renamed from lib/lit.common.unit.configured.in)2
21 files changed, 27 insertions, 29 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 55fe62f55..97cd61455 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -248,8 +248,6 @@ endif()
add_subdirectory(lib)
if(LLVM_INCLUDE_TESTS)
- # Currently the tests have not been ported to CMake, so disable this
- # directory.
- #
- #add_subdirectory(test)
+ add_subdirectory(test)
+ add_subdirectory(unittests)
endif()
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 9c4e29894..4b37b254d 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -34,13 +34,3 @@ if(LLVM_USE_SANITIZER STREQUAL "")
endif()
add_subdirectory(builtins)
-
-# Generate configs for running lit and unit tests.
-configure_lit_site_cfg(
- ${CMAKE_CURRENT_SOURCE_DIR}/lit.common.configured.in
- ${CMAKE_CURRENT_BINARY_DIR}/lit.common.configured)
-
-configure_lit_site_cfg(
- ${CMAKE_CURRENT_SOURCE_DIR}/lit.common.unit.configured.in
- ${CMAKE_CURRENT_BINARY_DIR}/lit.common.unit.configured)
-
diff --git a/lib/asan/lit_tests/GenericConfig/lit.site.cfg.in b/lib/asan/lit_tests/GenericConfig/lit.site.cfg.in
index 7ecf0e581..7d552f3fc 100644
--- a/lib/asan/lit_tests/GenericConfig/lit.site.cfg.in
+++ b/lib/asan/lit_tests/GenericConfig/lit.site.cfg.in
@@ -11,7 +11,7 @@ config.bits = "@ASAN_TEST_BITS@"
config.android = "@CAN_TARGET_arm_android@"
# Load common config for all compiler-rt lit tests.
-lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/lib/lit.common.configured")
+lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/test/lit.common.configured")
# Load tool-specific config that would do the real work.
lit_config.load_config(config, "@ASAN_SOURCE_DIR@/lit_tests/lit.cfg")
diff --git a/lib/asan/lit_tests/Unit/lit.site.cfg.in b/lib/asan/lit_tests/Unit/lit.site.cfg.in
index 6e4adfc4c..f6d9ed94d 100644
--- a/lib/asan/lit_tests/Unit/lit.site.cfg.in
+++ b/lib/asan/lit_tests/Unit/lit.site.cfg.in
@@ -2,7 +2,7 @@
# Do not edit!
# Load common config for all compiler-rt unit tests.
-lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/lib/lit.common.unit.configured")
+lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/unittests/lit.common.unit.configured")
# Setup config name.
config.name = 'AddressSanitizer-Unit'
diff --git a/lib/dfsan/lit_tests/lit.site.cfg.in b/lib/dfsan/lit_tests/lit.site.cfg.in
index 0cf6d6b55..7c366a01f 100644
--- a/lib/dfsan/lit_tests/lit.site.cfg.in
+++ b/lib/dfsan/lit_tests/lit.site.cfg.in
@@ -1,5 +1,5 @@
# Load common config for all compiler-rt lit tests.
-lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/lib/lit.common.configured")
+lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/test/lit.common.configured")
# Load tool-specific config that would do the real work.
lit_config.load_config(config, "@DFSAN_SOURCE_DIR@/lit_tests/lit.cfg")
diff --git a/lib/lsan/lit_tests/AsanConfig/lit.site.cfg.in b/lib/lsan/lit_tests/AsanConfig/lit.site.cfg.in
index 9cf6572c5..95f006954 100644
--- a/lib/lsan/lit_tests/AsanConfig/lit.site.cfg.in
+++ b/lib/lsan/lit_tests/AsanConfig/lit.site.cfg.in
@@ -1,5 +1,5 @@
# Load common config for all compiler-rt lit tests.
-lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/lib/lit.common.configured")
+lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/test/lit.common.configured")
# Tool-specific config options.
config.lsan_lit_src_root = "@LSAN_LIT_SOURCE_DIR@"
diff --git a/lib/lsan/lit_tests/LsanConfig/lit.site.cfg.in b/lib/lsan/lit_tests/LsanConfig/lit.site.cfg.in
index 2a6d724c0..8e9076e94 100644
--- a/lib/lsan/lit_tests/LsanConfig/lit.site.cfg.in
+++ b/lib/lsan/lit_tests/LsanConfig/lit.site.cfg.in
@@ -1,5 +1,5 @@
# Load common config for all compiler-rt lit tests.
-lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/lib/lit.common.configured")
+lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/test/lit.common.configured")
# Tool-specific config options.
config.lsan_lit_src_root = "@LSAN_LIT_SOURCE_DIR@"
diff --git a/lib/lsan/lit_tests/Unit/lit.site.cfg.in b/lib/lsan/lit_tests/Unit/lit.site.cfg.in
index a3a4e9ad0..a3db63fe6 100644
--- a/lib/lsan/lit_tests/Unit/lit.site.cfg.in
+++ b/lib/lsan/lit_tests/Unit/lit.site.cfg.in
@@ -2,7 +2,7 @@
# Do not edit!
# Load common config for all compiler-rt unit tests.
-lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/lib/lit.common.unit.configured")
+lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/unittests/lit.common.unit.configured")
# Setup config name.
config.name = 'LeakSanitizer-Unit'
diff --git a/lib/msan/lit_tests/Unit/lit.site.cfg.in b/lib/msan/lit_tests/Unit/lit.site.cfg.in
index 8e67f557d..34ae3c0e0 100644
--- a/lib/msan/lit_tests/Unit/lit.site.cfg.in
+++ b/lib/msan/lit_tests/Unit/lit.site.cfg.in
@@ -2,7 +2,7 @@
# Do not edit!
# Load common config for all compiler-rt unit tests.
-lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/lib/lit.common.unit.configured")
+lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/unittests/lit.common.unit.configured")
# Setup config name.
config.name = 'MemorySanitizer-Unit'
diff --git a/lib/msan/lit_tests/lit.site.cfg.in b/lib/msan/lit_tests/lit.site.cfg.in
index 946df778f..6d1eccc01 100644
--- a/lib/msan/lit_tests/lit.site.cfg.in
+++ b/lib/msan/lit_tests/lit.site.cfg.in
@@ -1,5 +1,5 @@
# Load common config for all compiler-rt lit tests.
-lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/lib/lit.common.configured")
+lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/test/lit.common.configured")
# Load tool-specific config that would do the real work.
lit_config.load_config(config, "@MSAN_SOURCE_DIR@/lit_tests/lit.cfg")
diff --git a/lib/sanitizer_common/tests/lit.site.cfg.in b/lib/sanitizer_common/tests/lit.site.cfg.in
index 5ceb9e4c5..59a059054 100644
--- a/lib/sanitizer_common/tests/lit.site.cfg.in
+++ b/lib/sanitizer_common/tests/lit.site.cfg.in
@@ -2,7 +2,7 @@
# Do not edit!
# Load common config for all compiler-rt unit tests.
-lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/lib/lit.common.unit.configured")
+lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/unittests/lit.common.unit.configured")
# Setup config name.
config.name = 'SanitizerCommon-Unit'
diff --git a/lib/tsan/lit_tests/Unit/lit.site.cfg.in b/lib/tsan/lit_tests/Unit/lit.site.cfg.in
index 3701a2cad..5d7242d11 100644
--- a/lib/tsan/lit_tests/Unit/lit.site.cfg.in
+++ b/lib/tsan/lit_tests/Unit/lit.site.cfg.in
@@ -2,7 +2,7 @@
# Do not edit!
# Load common config for all compiler-rt unit tests.
-lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/lib/lit.common.unit.configured")
+lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/unittests/lit.common.unit.configured")
# Load tool-specific config that would do the real work.
lit_config.load_config(config, "@CMAKE_CURRENT_SOURCE_DIR@/Unit/lit.cfg")
diff --git a/lib/tsan/lit_tests/lit.site.cfg.in b/lib/tsan/lit_tests/lit.site.cfg.in
index b0e427446..aebdd5ebc 100644
--- a/lib/tsan/lit_tests/lit.site.cfg.in
+++ b/lib/tsan/lit_tests/lit.site.cfg.in
@@ -2,7 +2,7 @@
# Do not edit!
# Load common config for all compiler-rt lit tests.
-lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/lib/lit.common.configured")
+lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/test/lit.common.configured")
# Load tool-specific config that would do the real work.
lit_config.load_config(config, "@CMAKE_CURRENT_SOURCE_DIR@/lit.cfg")
diff --git a/lib/ubsan/lit_tests/AsanConfig/lit.site.cfg.in b/lib/ubsan/lit_tests/AsanConfig/lit.site.cfg.in
index f75741838..03d55fc56 100644
--- a/lib/ubsan/lit_tests/AsanConfig/lit.site.cfg.in
+++ b/lib/ubsan/lit_tests/AsanConfig/lit.site.cfg.in
@@ -1,5 +1,5 @@
# Load common config for all compiler-rt lit tests.
-lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/lib/lit.common.configured")
+lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/test/lit.common.configured")
# Tool-specific config options.
config.ubsan_lit_tests_dir = "@UBSAN_LIT_TESTS_DIR@"
diff --git a/lib/ubsan/lit_tests/UbsanConfig/lit.site.cfg.in b/lib/ubsan/lit_tests/UbsanConfig/lit.site.cfg.in
index c08fc30d0..6554bac86 100644
--- a/lib/ubsan/lit_tests/UbsanConfig/lit.site.cfg.in
+++ b/lib/ubsan/lit_tests/UbsanConfig/lit.site.cfg.in
@@ -1,5 +1,5 @@
# Load common config for all compiler-rt lit tests.
-lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/lib/lit.common.configured")
+lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/test/lit.common.configured")
# Tool-specific config options.
config.ubsan_lit_tests_dir = "@UBSAN_LIT_TESTS_DIR@"
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
new file mode 100644
index 000000000..1ab0cb522
--- /dev/null
+++ b/test/CMakeLists.txt
@@ -0,0 +1,7 @@
+configure_lit_site_cfg(
+ ${CMAKE_CURRENT_SOURCE_DIR}/lit.common.configured.in
+ ${CMAKE_CURRENT_BINARY_DIR}/lit.common.configured)
+
+# BlocksRuntime and builtins testsuites are not yet ported to lit.
+# add_subdirectory(BlocksRuntime)
+# add_subdirectory(builtins)
diff --git a/lib/lit.common.cfg b/test/lit.common.cfg
index 4b198f21e..4b198f21e 100644
--- a/lib/lit.common.cfg
+++ b/test/lit.common.cfg
diff --git a/lib/lit.common.configured.in b/test/lit.common.configured.in
index bfed0424c..3b1083021 100644
--- a/lib/lit.common.configured.in
+++ b/test/lit.common.configured.in
@@ -29,4 +29,4 @@ except KeyError,e:
lit_config.fatal("unable to find %r parameter, use '--param=%s=VALUE'" % (key, key))
# Setup attributes common for all compiler-rt projects.
-lit_config.load_config(config, "@COMPILER_RT_SOURCE_DIR@/lib/lit.common.cfg")
+lit_config.load_config(config, "@COMPILER_RT_SOURCE_DIR@/test/lit.common.cfg")
diff --git a/unittests/CMakeLists.txt b/unittests/CMakeLists.txt
new file mode 100644
index 000000000..fe2c39781
--- /dev/null
+++ b/unittests/CMakeLists.txt
@@ -0,0 +1,3 @@
+configure_lit_site_cfg(
+ ${CMAKE_CURRENT_SOURCE_DIR}/lit.common.unit.configured.in
+ ${CMAKE_CURRENT_BINARY_DIR}/lit.common.unit.configured)
diff --git a/lib/lit.common.unit.cfg b/unittests/lit.common.unit.cfg
index 2bd8f376f..2bd8f376f 100644
--- a/lib/lit.common.unit.cfg
+++ b/unittests/lit.common.unit.cfg
diff --git a/lib/lit.common.unit.configured.in b/unittests/lit.common.unit.configured.in
index f2c5373f3..fe827c638 100644
--- a/lib/lit.common.unit.configured.in
+++ b/unittests/lit.common.unit.configured.in
@@ -21,4 +21,4 @@ except KeyError,e:
lit_config.fatal("unable to find %r parameter, use '--param=%s=VALUE'" % (key, key))
# Setup attributes common for all compiler-rt unit tests.
-lit_config.load_config(config, "@COMPILER_RT_SOURCE_DIR@/lib/lit.common.unit.cfg")
+lit_config.load_config(config, "@COMPILER_RT_SOURCE_DIR@/unittests/lit.common.unit.cfg")