diff options
| author | Daniel Sanders <daniel.sanders@imgtec.com> | 2016-02-12 14:48:19 +0000 |
|---|---|---|
| committer | Daniel Sanders <daniel.sanders@imgtec.com> | 2016-02-12 14:48:19 +0000 |
| commit | 2f1025d68a2214ea704bf29a9d5ac7e6cc8d2bf0 (patch) | |
| tree | a54ea593e266d8bb554847f96df81d640080fd7b | |
| parent | e59964377cdf3b716d2792d22cf7235bc6a3ef58 (diff) | |
| download | bcm5719-llvm-2f1025d68a2214ea704bf29a9d5ac7e6cc8d2bf0.tar.gz bcm5719-llvm-2f1025d68a2214ea704bf29a9d5ac7e6cc8d2bf0.zip | |
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
| -rw-r--r-- | compiler-rt/test/msan/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | compiler-rt/test/msan/lit.cfg | 2 | ||||
| -rw-r--r-- | compiler-rt/test/tsan/CMakeLists.txt | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/compiler-rt/test/msan/CMakeLists.txt b/compiler-rt/test/msan/CMakeLists.txt index ba4154676ae..00638b30040 100644 --- a/compiler-rt/test/msan/CMakeLists.txt +++ b/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") diff --git a/compiler-rt/test/msan/lit.cfg b/compiler-rt/test/msan/lit.cfg index df160c7a348..ed797bdf5cc 100644 --- a/compiler-rt/test/msan/lit.cfg +++ b/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__) diff --git a/compiler-rt/test/tsan/CMakeLists.txt b/compiler-rt/test/tsan/CMakeLists.txt index f45a6fc5912..39f8be09a1b 100644 --- a/compiler-rt/test/tsan/CMakeLists.txt +++ b/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") |
