[llvm-commits] [compiler-rt] r169729 - /compiler-rt/trunk/lib/tsan/tests/rtl/tsan_string.cc

[Dmitry Vyukov]

Author: dvyukov
Date: Mon Dec 10 03:16:17 2012
New Revision: 169729

URL: http://llvm.org/viewvc/llvm-project?rev=169729&view=rev
Log:
tsan: exclude flaky test

Modified:
    compiler-rt/trunk/lib/tsan/tests/rtl/tsan_string.cc

Modified: compiler-rt/trunk/lib/tsan/tests/rtl/tsan_string.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/tests/rtl/tsan_string.cc?rev=169729&r1=169728&r2=169729&view=diff
==============================================================================
--- compiler-rt/trunk/lib/tsan/tests/rtl/tsan_string.cc (original)
+++ compiler-rt/trunk/lib/tsan/tests/rtl/tsan_string.cc Mon Dec 10 03:16:17 2012
@@ -46,6 +46,9 @@
   t2.Memcpy(data, data2, 10, true);
 }
 
+// The test fails with TSAN_SHADOW_COUNT=2,
+// because the old racy access is evicted.
+#if defined(TSAN_SHADOW_COUNT) && TSAN_SHADOW_COUNT >= 4
 TEST(ThreadSanitizer, MemcpyRace2) {
   char *data = new char[10];
   char *data1 = new char[10];
@@ -54,6 +57,7 @@
   t1.Memcpy(data+5, data1, 1);
   t2.Memcpy(data+3, data2, 4, true);
 }
+#endif
 
 TEST(ThreadSanitizer, MemcpyRace3) {
   char *data = new char[10];