[TSan] Fix custom scripts that validate TSan on non-standard buildbot.

llvm-svn: 253682

compiler-rt/lib/tsan/check_analyze.sh

@@ -22,7 +22,13 @@ for f in write1; do
   check $f pop 2
 done
 
-for f in write2 write4 write8; do
+for f in write2 write4; do
+  check $f rsp 1
+  check $f push 4
+  check $f pop 4
+done
+
+for f in write8; do
   check $f rsp 1
   check $f push 3
   check $f pop 3

compiler-rt/test/tsan/test_output.sh

@@ -48,6 +48,10 @@ if [ "$1" == "" ]; then
       echo SKIPPING $c -- requires TSAN_OPTIONS
       continue
     fi
+    if [ "`grep "env_tsan_opts" $c`" ]; then
+      echo SKIPPING $c -- requires TSAN_OPTIONS
+      continue
+    fi
     if [ "`grep "XFAIL" $c`" ]; then
       echo SKIPPING $c -- has XFAIL
       continue