summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans Wennborg <hans@hanshq.net>2016-02-17 22:02:12 +0000
committerHans Wennborg <hans@hanshq.net>2016-02-17 22:02:12 +0000
commitb2c82d129f21c2ee31e4a158f10f675f9bac8a7e (patch)
treed3bf02ccb8ce20b8d2f1d8d7e79b20d023fcc3a4
parentee0549d49f268bfe715053a75b5e7161205acd90 (diff)
downloadcompiler-rt-b2c82d129f21c2ee31e4a158f10f675f9bac8a7e.tar.gz
Merging the tsan parts of r260669 and r261142:
------------------------------------------------------------------------ r260669 | dsanders | 2016-02-12 02:35:53 -0800 (Fri, 12 Feb 2016) | 9 lines [msan+tsan] Bring back the tests that disappeared after r260230 and r259512. The lit test-suite containing the unit tests needs to be explicitly specified as an argument to lit.py since it is no longer discovered when the other tests are run (because they are one directory deeper). dfsan, lsan, and sanitizer_common don't show the same problem. ------------------------------------------------------------------------ ------------------------------------------------------------------------ r261142 | samsonov | 2016-02-17 11:35:51 -0800 (Wed, 17 Feb 2016) | 1 line [tests] Slightly improve a fix in r260669. ------------------------------------------------------------------------ git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/branches/release_38@261162 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--test/tsan/CMakeLists.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/test/tsan/CMakeLists.txt b/test/tsan/CMakeLists.txt
index f45a6fc59..a05860265 100644
--- a/test/tsan/CMakeLists.txt
+++ b/test/tsan/CMakeLists.txt
@@ -47,6 +47,7 @@ if(COMPILER_RT_INCLUDE_TESTS)
${CMAKE_CURRENT_SOURCE_DIR}/Unit/lit.site.cfg.in
${CMAKE_CURRENT_BINARY_DIR}/Unit/lit.site.cfg)
list(APPEND TSAN_TEST_DEPS TsanUnitTests)
+ list(APPEND TSAN_TESTSUITES ${CMAKE_CURRENT_BINARY_DIR}/Unit)
endif()
add_lit_testsuite(check-tsan "Running ThreadSanitizer tests"