[llvm-branch-commits] [compiler-rt-branch] r261162 - Merging the tsan parts of r260669 and r261142:

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Wed Feb 17 16:02:12 2016
New Revision: 261162

URL: http://llvm.org/viewvc/llvm-project?rev=261162&view=rev
Log:
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.
------------------------------------------------------------------------

Modified:
    compiler-rt/branches/release_38/   (props changed)
    compiler-rt/branches/release_38/test/tsan/CMakeLists.txt

Propchange: compiler-rt/branches/release_38/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 17 16:02:12 2016
@@ -1 +1 @@
-/compiler-rt/trunk:258916,259755,260839,261073
+/compiler-rt/trunk:258916,259755,260669,260839,261073,261142

Modified: compiler-rt/branches/release_38/test/tsan/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/branches/release_38/test/tsan/CMakeLists.txt?rev=261162&r1=261161&r2=261162&view=diff
==============================================================================
--- compiler-rt/branches/release_38/test/tsan/CMakeLists.txt (original)
+++ compiler-rt/branches/release_38/test/tsan/CMakeLists.txt Wed Feb 17 16:02:12 2016
@@ -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"