From 3e49a7bc32fd1c1c6b6171620be2a2eded52b51d Mon Sep 17 00:00:00 2001
From: Alexey Samsonov <vonosmas@gmail.com>
Date: Fri, 20 Nov 2015 18:13:03 +0000
Subject: [PATCH] [TSan] Fix custom scripts that validate TSan on non-standard
 buildbot.

llvm-svn: 253682
---
 compiler-rt/lib/tsan/check_analyze.sh | 8 +++++++-
 compiler-rt/test/tsan/test_output.sh  | 4 ++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/compiler-rt/lib/tsan/check_analyze.sh b/compiler-rt/lib/tsan/check_analyze.sh
index 4b33393ef648..9d45cc00c972 100755
--- a/compiler-rt/lib/tsan/check_analyze.sh
+++ b/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
diff --git a/compiler-rt/test/tsan/test_output.sh b/compiler-rt/test/tsan/test_output.sh
index bce0fe8b5511..07fcab7bf9ec 100755
--- a/compiler-rt/test/tsan/test_output.sh
+++ b/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