[llvm-commits] [compiler-rt] r159533 - in /compiler-rt/trunk/lib/tsan: Makefile.old rtl_tests/tsan_test.cc

[Alexey Samsonov]

Author: samsonov
Date: Mon Jul  2 09:35:25 2012
New Revision: 159533

URL: http://llvm.org/viewvc/llvm-project?rev=159533&view=rev
Log:
[TSan] use threadsafe death tests in TSan unit tests

Modified:
    compiler-rt/trunk/lib/tsan/Makefile.old
    compiler-rt/trunk/lib/tsan/rtl_tests/tsan_test.cc

Modified: compiler-rt/trunk/lib/tsan/Makefile.old
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/Makefile.old?rev=159533&r1=159532&r2=159533&view=diff
==============================================================================
--- compiler-rt/trunk/lib/tsan/Makefile.old (original)
+++ compiler-rt/trunk/lib/tsan/Makefile.old Mon Jul  2 09:35:25 2012
@@ -46,7 +46,7 @@
 %.o: %.cc $(UNIT_TEST_HDR)
 	$(CXX) $(CXXFLAGS) $(CFLAGS) $(INCLUDES) -o $@ -c $<
 
-tsan_test: $(TEST_OBJ) $(UNIT_TEST_OBJ) $(RTL_TEST_OBJ) \
+tsan_test: $(UNIT_TEST_OBJ) $(RTL_TEST_OBJ) \
            $(SANITIZER_COMMON_TESTS_OBJ) $(LIBTSAN) $(GTEST_LIB)
 	$(CXX) $^ -o $@ $(LDFLAGS)
 

Modified: compiler-rt/trunk/lib/tsan/rtl_tests/tsan_test.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/rtl_tests/tsan_test.cc?rev=159533&r1=159532&r2=159533&view=diff
==============================================================================
--- compiler-rt/trunk/lib/tsan/rtl_tests/tsan_test.cc (original)
+++ compiler-rt/trunk/lib/tsan/rtl_tests/tsan_test.cc Mon Jul  2 09:35:25 2012
@@ -34,6 +34,7 @@
   __tsan_func_entry(__builtin_return_address(0));
   __tsan_func_entry((char*)&main + 1);
 
+  testing::GTEST_FLAG(death_test_style) = "threadsafe";
   testing::InitGoogleTest(&argc, argv);
   int res = RUN_ALL_TESTS();