Re-commit r260230 with a fix for clang-cmake-aarch64-42vma.

There is now a default name_suffix ('default') which should appease the buildbot
and reveal why this builder lacks a suffix.

llvm-svn: 260679

compiler-rt/test/msan/CMakeLists.txt

@@ -41,7 +41,7 @@ if(COMPILER_RT_INCLUDE_TESTS AND COMPILER_RT_HAS_LIBCXX_SOURCES)
 endif()
 
 add_lit_testsuite(check-msan "Running the MemorySanitizer tests"
-  ${MSAN_TESTSUITES}
+  ${MSAN_TESTSUITES} ${CMAKE_CURRENT_BINARY_DIR}/Unit
   DEPENDS ${MSAN_TEST_DEPS}
   )
 set_target_properties(check-msan PROPERTIES FOLDER "MSan tests")

compiler-rt/test/msan/lit.cfg

@@ -3,7 +3,7 @@
 import os
 
 # Setup config name.
-config.name = 'MemorySanitizer' + config.name_suffix
+config.name = 'MemorySanitizer' + getattr(config, 'name_suffix', 'default')
 
 # Setup source root.
 config.test_source_root = os.path.dirname(__file__)

compiler-rt/test/tsan/CMakeLists.txt

@@ -50,6 +50,6 @@ if(COMPILER_RT_INCLUDE_TESTS)
 endif()
 
 add_lit_testsuite(check-tsan "Running ThreadSanitizer tests"
-  ${TSAN_TESTSUITES}
+  ${TSAN_TESTSUITES} ${CMAKE_CURRENT_BINARY_DIR}/Unit
   DEPENDS ${TSAN_TEST_DEPS})
 set_target_properties(check-tsan PROPERTIES FOLDER "TSan tests")