summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xcompiler-rt/lib/tsan/check_analyze.sh8
-rwxr-xr-xcompiler-rt/test/tsan/test_output.sh4
2 files changed, 11 insertions, 1 deletions
diff --git a/compiler-rt/lib/tsan/check_analyze.sh b/compiler-rt/lib/tsan/check_analyze.sh
index 4b33393ef64..9d45cc00c97 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 bce0fe8b551..07fcab7bf9e 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
OpenPOWER on IntegriCloud