tsan: work around FileCheck feature that it does not accept empty input

llvm-svn: 171034

12 files changed, 11 insertions, 4 deletions

diff --git a/compiler-rt/lib/tsan/lit_tests/fd_close_norace.cc b/compiler-rt/lib/tsan/lit_tests/fd_close_norace.cc
index c000de4cf1e..a8b1a6d7b9e 100644
--- a/compiler-rt/lib/tsan/lit_tests/fd_close_norace.cc
+++ b/compiler-rt/lib/tsan/lit_tests/fd_close_norace.cc
@@ -25,6 +25,7 @@ int main() {
   pthread_create(&t[1], NULL, Thread2, NULL);
   pthread_join(t[0], NULL);
   pthread_join(t[1], NULL);
+  printf("OK\n");
 }
 
 // CHECK-NOT: WARNING: ThreadSanitizer: data race
diff --git a/compiler-rt/lib/tsan/lit_tests/fd_dup_norace.cc b/compiler-rt/lib/tsan/lit_tests/fd_dup_norace.cc
index bb3ed46b27a..8826f90fc48 100644
--- a/compiler-rt/lib/tsan/lit_tests/fd_dup_norace.cc
+++ b/compiler-rt/lib/tsan/lit_tests/fd_dup_norace.cc
@@ -28,6 +28,7 @@ int main() {
   pthread_create(&t[1], NULL, Thread2, NULL);
   pthread_join(t[0], NULL);
   pthread_join(t[1], NULL);
+  printf("OK\n");
 }
 
 // CHECK-NOT: WARNING: ThreadSanitizer: data race
diff --git a/compiler-rt/lib/tsan/lit_tests/fd_pipe_norace.cc b/compiler-rt/lib/tsan/lit_tests/fd_pipe_norace.cc
index 1be1a3474b0..2da69ea2111 100644
--- a/compiler-rt/lib/tsan/lit_tests/fd_pipe_norace.cc
+++ b/compiler-rt/lib/tsan/lit_tests/fd_pipe_norace.cc
@@ -27,6 +27,7 @@ int main() {
   pthread_create(&t[1], NULL, Thread2, NULL);
   pthread_join(t[0], NULL);
   pthread_join(t[1], NULL);
+  printf("OK\n");
 }
 
 // CHECK-NOT: WARNING: ThreadSanitizer: data race
diff --git a/compiler-rt/lib/tsan/lit_tests/fd_socket_connect_norace.cc b/compiler-rt/lib/tsan/lit_tests/fd_socket_connect_norace.cc
index a1e2e894bd4..065299a9c6b 100644
--- a/compiler-rt/lib/tsan/lit_tests/fd_socket_connect_norace.cc
+++ b/compiler-rt/lib/tsan/lit_tests/fd_socket_connect_norace.cc
@@ -38,6 +38,7 @@ int main() {
   pthread_join(t, 0);
   close(c);
   close(s);
+  printf("OK\n");
 }
 
 // CHECK-NOT: WARNING: ThreadSanitizer: data race
diff --git a/compiler-rt/lib/tsan/lit_tests/fd_socket_norace.cc b/compiler-rt/lib/tsan/lit_tests/fd_socket_norace.cc
index 3a128f89009..243fc9de223 100644
--- a/compiler-rt/lib/tsan/lit_tests/fd_socket_norace.cc
+++ b/compiler-rt/lib/tsan/lit_tests/fd_socket_norace.cc
@@ -45,6 +45,7 @@ int main() {
   close(c);
   close(s);
   pthread_join(t, 0);
+  printf("OK\n");
 }
 
 // CHECK-NOT: WARNING: ThreadSanitizer: data race
diff --git a/compiler-rt/lib/tsan/lit_tests/fd_socketpair_norace.cc b/compiler-rt/lib/tsan/lit_tests/fd_socketpair_norace.cc
index 2a714ab002b..f91e4eca0fe 100644
--- a/compiler-rt/lib/tsan/lit_tests/fd_socketpair_norace.cc
+++ b/compiler-rt/lib/tsan/lit_tests/fd_socketpair_norace.cc
@@ -31,6 +31,7 @@ int main() {
   pthread_create(&t[1], NULL, Thread2, NULL);
   pthread_join(t[0], NULL);
   pthread_join(t[1], NULL);
+  printf("OK\n");
 }
 
 // CHECK-NOT: WARNING: ThreadSanitizer: data race
diff --git a/compiler-rt/lib/tsan/lit_tests/ignore_race.cc b/compiler-rt/lib/tsan/lit_tests/ignore_race.cc
index 7a60ca10c26..23d74d0ed84 100644
--- a/compiler-rt/lib/tsan/lit_tests/ignore_race.cc
+++ b/compiler-rt/lib/tsan/lit_tests/ignore_race.cc
@@ -25,7 +25,7 @@ int main() {
   sleep(1);
   Global = 43;
   pthread_join(t, 0);
-  return 0;
+  printf("OK\n");
 }
 
 // CHECK-NOT: WARNING: ThreadSanitizer: data race
diff --git a/compiler-rt/lib/tsan/lit_tests/java_alloc.cc b/compiler-rt/lib/tsan/lit_tests/java_alloc.cc
index e3210fe33de..4dbce70c31e 100644
--- a/compiler-rt/lib/tsan/lit_tests/java_alloc.cc
+++ b/compiler-rt/lib/tsan/lit_tests/java_alloc.cc
@@ -25,6 +25,7 @@ int main() {
   pthread_create(&th, 0, Thread, (void*)(jheap + kHeapSize / 4));
   stress(jheap);
   pthread_join(th, 0);
+  printf("OK\n");
   return __tsan_java_fini();
 }
 
diff --git a/compiler-rt/lib/tsan/lit_tests/java_lock.cc b/compiler-rt/lib/tsan/lit_tests/java_lock.cc
index 7ab50d1d9a3..f66f1e7097f 100644
--- a/compiler-rt/lib/tsan/lit_tests/java_lock.cc
+++ b/compiler-rt/lib/tsan/lit_tests/java_lock.cc
@@ -26,6 +26,7 @@ int main() {
   __tsan_java_mutex_unlock(lockaddr);
   pthread_join(th, 0);
   __tsan_java_free((jptr)jheap, kBlockSize);
+  printf("OK\n");
   return __tsan_java_fini();
 }
 
diff --git a/compiler-rt/lib/tsan/lit_tests/java_lock_move.cc b/compiler-rt/lib/tsan/lit_tests/java_lock_move.cc
index 42c7e77689a..48b5a5a88d3 100644
--- a/compiler-rt/lib/tsan/lit_tests/java_lock_move.cc
+++ b/compiler-rt/lib/tsan/lit_tests/java_lock_move.cc
@@ -33,6 +33,7 @@ int main() {
   __tsan_java_move(varaddr, varaddr2, kBlockSize);
   pthread_join(th, 0);
   __tsan_java_free(varaddr2, kBlockSize);
+  printf("OK\n");
   return __tsan_java_fini();
 }
 
diff --git a/compiler-rt/lib/tsan/lit_tests/java_rwlock.cc b/compiler-rt/lib/tsan/lit_tests/java_rwlock.cc
index 6dab614d5d1..1e8940afd7d 100644
--- a/compiler-rt/lib/tsan/lit_tests/java_rwlock.cc
+++ b/compiler-rt/lib/tsan/lit_tests/java_rwlock.cc
@@ -26,6 +26,7 @@ int main() {
   __tsan_java_mutex_unlock(lockaddr);
   pthread_join(th, 0);
   __tsan_java_free((jptr)jheap, kBlockSize);
+  printf("OK\n");
   return __tsan_java_fini();
 }
 
diff --git a/compiler-rt/lib/tsan/lit_tests/test_output.sh b/compiler-rt/lib/tsan/lit_tests/test_output.sh
index 8c96f60f766..b772848bd97 100755
--- a/compiler-rt/lib/tsan/lit_tests/test_output.sh
+++ b/compiler-rt/lib/tsan/lit_tests/test_output.sh
@@ -22,9 +22,6 @@ test_file() {
   $COMPILER $SRC $CFLAGS -c -o $OBJ
   $COMPILER $OBJ $LDFLAGS -o $EXE
   RES=$($EXE 2>&1 || true)
-  if [ "$3" != "" ]; then
-    printf "%s\n" "$RES"
-  fi
   printf "%s\n" "$RES" | FileCheck $SRC
   if [ "$3" == "" ]; then
     rm -f $EXE $OBJ