[CMake] lit tests shouldn't depend on runtimes in standalone build

git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@201771 91177308-0d34-0410-b5e6-96231b3b80d8

6 files changed, 27 insertions, 24 deletions

diff --git a/test/asan/CMakeLists.txt b/test/asan/CMakeLists.txt
index 1ba0e3d86..954fc7065 100644
--- a/test/asan/CMakeLists.txt
+++ b/test/asan/CMakeLists.txt
@@ -46,12 +46,11 @@ configure_lit_site_cfg(
   )
 endif()
 
-# Run ASan tests only if we're sure we may produce working binaries.
-set(ASAN_TEST_DEPS
-  ${SANITIZER_COMMON_LIT_TEST_DEPS}
-  asan)
-set(ASAN_TEST_PARAMS
-  asan_site_config=${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg)
+set(ASAN_TEST_DEPS ${SANITIZER_COMMON_LIT_TEST_DEPS})
+if(NOT COMPILER_RT_STANDALONE_BUILD)
+  list(APPEND ASAN_TEST_DEPS asan)
+endif()
+
 # FIXME: support unit test in the android test runner
 if(COMPILER_RT_INCLUDE_TESTS AND NOT CAN_TARGET_arm_android)
   list(APPEND ASAN_TEST_DEPS AsanUnitTests)
@@ -59,6 +58,5 @@ if(COMPILER_RT_INCLUDE_TESTS AND NOT CAN_TARGET_arm_android)
 endif()
 add_lit_testsuite(check-asan "Running the AddressSanitizer tests"
   ${ASAN_TESTSUITES}
-  PARAMS ${ASAN_TEST_PARAMS}
   DEPENDS ${ASAN_TEST_DEPS})
 set_target_properties(check-asan PROPERTIES FOLDER "ASan tests")
diff --git a/test/dfsan/CMakeLists.txt b/test/dfsan/CMakeLists.txt
index 24b9ddf16..3fa1af24b 100644
--- a/test/dfsan/CMakeLists.txt
+++ b/test/dfsan/CMakeLists.txt
@@ -4,9 +4,11 @@ configure_lit_site_cfg(
   ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in
   ${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg)
 
-set(DFSAN_TEST_DEPS
-  ${SANITIZER_COMMON_LIT_TEST_DEPS}
-  dfsan)
+set(DFSAN_TEST_DEPS ${SANITIZER_COMMON_LIT_TEST_DEPS})
+if(NOT COMPILER_RT_STANDALONE_BUILD)
+  list(APPEND DFSAN_TEST_DEPS dfsan)
+endif()
+
 add_lit_testsuite(check-dfsan "Running the DataFlowSanitizer tests"
   ${CMAKE_CURRENT_BINARY_DIR}
   DEPENDS ${DFSAN_TEST_DEPS})
diff --git a/test/lsan/CMakeLists.txt b/test/lsan/CMakeLists.txt
index 0f3859762..7f49b0d39 100644
--- a/test/lsan/CMakeLists.txt
+++ b/test/lsan/CMakeLists.txt
@@ -11,10 +11,10 @@ configure_lit_site_cfg(
   ${CMAKE_CURRENT_BINARY_DIR}/AsanConfig/lit.site.cfg)
 
 if(NOT APPLE AND NOT ANDROID)
-  set(LSAN_TEST_DEPS
-    ${SANITIZER_COMMON_LIT_TEST_DEPS}
-    lsan
-    asan)
+  set(LSAN_TEST_DEPS ${SANITIZER_COMMON_LIT_TEST_DEPS})
+  if(NOT COMPILER_RT_STANDALONE_BUILD)
+    list(APPEND LSAN_TEST_DEPS lsan asan)
+  endif()
   add_lit_testsuite(check-lsan "Running the LeakSanitizer tests"
     ${CMAKE_CURRENT_BINARY_DIR}/LsanConfig
     ${CMAKE_CURRENT_BINARY_DIR}/AsanConfig
diff --git a/test/msan/CMakeLists.txt b/test/msan/CMakeLists.txt
index aa29f3594..08786ee77 100644
--- a/test/msan/CMakeLists.txt
+++ b/test/msan/CMakeLists.txt
@@ -4,9 +4,10 @@ configure_lit_site_cfg(
   ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in
   ${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg)
 
-set(MSAN_TEST_DEPS
-  ${SANITIZER_COMMON_LIT_TEST_DEPS}
-  msan)
+set(MSAN_TEST_DEPS ${SANITIZER_COMMON_LIT_TEST_DEPS})
+if(NOT COMPILER_RT_STANDALONE_BUILD)
+  list(APPEND MSAN_TEST_DEPS msan)
+endif()
 
 if(COMPILER_RT_INCLUDE_TESTS AND COMPILER_RT_HAS_LIBCXX_SOURCES)
   configure_lit_site_cfg(
diff --git a/test/tsan/CMakeLists.txt b/test/tsan/CMakeLists.txt
index 4e7160e99..b54b42b60 100644
--- a/test/tsan/CMakeLists.txt
+++ b/test/tsan/CMakeLists.txt
@@ -2,9 +2,10 @@ configure_lit_site_cfg(
   ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in
   ${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg)
 
-set(TSAN_TEST_DEPS
-  ${SANITIZER_COMMON_LIT_TEST_DEPS}
-  tsan)
+set(TSAN_TEST_DEPS ${SANITIZER_COMMON_LIT_TEST_DEPS})
+if(NOT COMPILER_RT_STANDALONE_BUILD)
+  list(APPEND TSAN_TEST_DEPS tsan)
+endif()
 
 if(COMPILER_RT_INCLUDE_TESTS)
   configure_lit_site_cfg(
diff --git a/test/ubsan/CMakeLists.txt b/test/ubsan/CMakeLists.txt
index 2924a0e74..ded124d16 100644
--- a/test/ubsan/CMakeLists.txt
+++ b/test/ubsan/CMakeLists.txt
@@ -10,10 +10,11 @@ configure_lit_site_cfg(
   ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in
   ${CMAKE_CURRENT_BINARY_DIR}/AsanConfig/lit.site.cfg)
 
-set(UBSAN_TEST_DEPS
-  ${SANITIZER_COMMON_LIT_TEST_DEPS}
-  ubsan
-  asan)
+set(UBSAN_TEST_DEPS ${SANITIZER_COMMON_LIT_TEST_DEPS})
+if(NOT COMPILER_RT_STANDALONE_BUILD)
+  list(APPEND UBSAN_TEST_DEPS ubsan asan)
+endif()
+
 add_lit_testsuite(check-ubsan "Running UndefinedBehaviorSanitizer tests"
   ${CMAKE_CURRENT_BINARY_DIR}/UbsanConfig
   ${CMAKE_CURRENT_BINARY_DIR}/AsanConfig