intel/llvm
1
0
Fork 0
mirror of https://github.com/intel/llvm.git synced 2026-01-17 06:40:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Move shared configs for lit test suites to test/ and unittests/ directories

Browse Source 
llvm-svn: 201399
This commit is contained in:
Alexey Samsonov
2014-02-14 11:00:07 +00:00
parent 31eb03f817
commit 81a2b466e9
21 changed files with 27 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
compiler-rt/CMakeLists.txt
View File

@@ -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()

10
compiler-rt/lib/CMakeLists.txt
View File

@@ -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)

2
compiler-rt/lib/asan/lit_tests/GenericConfig/lit.site.cfg.in
View File

@@ -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")

2
compiler-rt/lib/asan/lit_tests/Unit/lit.site.cfg.in
View File

@@ -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'

2
compiler-rt/lib/dfsan/lit_tests/lit.site.cfg.in
View File

@@ -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")

2
compiler-rt/lib/lsan/lit_tests/AsanConfig/lit.site.cfg.in
View File

@@ -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@"

2
compiler-rt/lib/lsan/lit_tests/LsanConfig/lit.site.cfg.in
View File

@@ -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@"

2
compiler-rt/lib/lsan/lit_tests/Unit/lit.site.cfg.in
View File

@@ -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'

2
compiler-rt/lib/msan/lit_tests/Unit/lit.site.cfg.in
View File

@@ -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'

2
compiler-rt/lib/msan/lit_tests/lit.site.cfg.in
View File

@@ -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")

2
compiler-rt/lib/sanitizer_common/tests/lit.site.cfg.in
View File

@@ -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'

2
compiler-rt/lib/tsan/lit_tests/Unit/lit.site.cfg.in
View File

@@ -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")

2
compiler-rt/lib/tsan/lit_tests/lit.site.cfg.in
View File

@@ -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")

2
compiler-rt/lib/ubsan/lit_tests/AsanConfig/lit.site.cfg.in
View File

@@ -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@"

2
compiler-rt/lib/ubsan/lit_tests/UbsanConfig/lit.site.cfg.in
View File

@@ -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@"

7
compiler-rt/test/CMakeLists.txt Normal file
View File

@@ -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)

0
compiler-rt/lib/lit.common.cfg → compiler-rt/test/lit.common.cfg
View File

2
compiler-rt/lib/lit.common.configured.in → compiler-rt/test/lit.common.configured.in
View File

@@ -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")

3
compiler-rt/unittests/CMakeLists.txt Normal file
View File

@@ -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)

0
compiler-rt/lib/lit.common.unit.cfg → compiler-rt/unittests/lit.common.unit.cfg
View File

2
compiler-rt/lib/lit.common.unit.configured.in → compiler-rt/unittests/lit.common.unit.configured.in
View File

@@ -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")