summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexey Samsonov <vonosmas@gmail.com>2016-02-17 20:40:10 +0000
committerAlexey Samsonov <vonosmas@gmail.com>2016-02-17 20:40:10 +0000
commit394f1d4159d217113ef6e58ae9fec555838d8fed (patch)
treebf5c12d63950f1f91c1ec56f32a5ea1029243e63
parenta5b2a64980695b3b6530822dcf0b0db7147c652a (diff)
downloadbcm5719-llvm-394f1d4159d217113ef6e58ae9fec555838d8fed.tar.gz
bcm5719-llvm-394f1d4159d217113ef6e58ae9fec555838d8fed.zip
[TSan] PR26609: Fix two test cases.
llvm-svn: 261148
-rw-r--r--compiler-rt/test/tsan/ignore_lib0.cc4
-rw-r--r--compiler-rt/test/tsan/printf-1.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/compiler-rt/test/tsan/ignore_lib0.cc b/compiler-rt/test/tsan/ignore_lib0.cc
index c72aa496a1c..d6ae72f3163 100644
--- a/compiler-rt/test/tsan/ignore_lib0.cc
+++ b/compiler-rt/test/tsan/ignore_lib0.cc
@@ -1,9 +1,9 @@
// RUN: %clangxx_tsan -O1 %s -DLIB -fPIC -fno-sanitize=thread -shared -o %T/libignore_lib0.so
// RUN: %clangxx_tsan -O1 %s -L%T -lignore_lib0 -o %t
// RUN: echo running w/o suppressions:
-// RUN: LD_LIBRARY_PATH=%T${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} %deflake %run %t | FileCheck %s --check-prefix=CHECK-NOSUPP
+// RUN: env LD_LIBRARY_PATH=%T${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} %deflake %run %t | FileCheck %s --check-prefix=CHECK-NOSUPP
// RUN: echo running with suppressions:
-// RUN: LD_LIBRARY_PATH=%T${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} %env_tsan_opts=suppressions='%s.supp' %run %t 2>&1 | FileCheck %s --check-prefix=CHECK-WITHSUPP
+// RUN: env LD_LIBRARY_PATH=%T${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} %env_tsan_opts=suppressions='%s.supp' %run %t 2>&1 | FileCheck %s --check-prefix=CHECK-WITHSUPP
// Tests that interceptors coming from a library specified in called_from_lib
// suppression are ignored.
diff --git a/compiler-rt/test/tsan/printf-1.c b/compiler-rt/test/tsan/printf-1.c
index 9116c956e30..c8414f834b4 100644
--- a/compiler-rt/test/tsan/printf-1.c
+++ b/compiler-rt/test/tsan/printf-1.c
@@ -1,6 +1,6 @@
// RUN: %clang_tsan -O2 %s -o %t
-// RUN: ASAN_OPTIONS=check_printf=1 %run %t 2>&1 | FileCheck %s
-// RUN: ASAN_OPTIONS=check_printf=0 %run %t 2>&1 | FileCheck %s
+// RUN: %env_tsan_opts=check_printf=1 %run %t 2>&1 | FileCheck %s
+// RUN: %env_tsan_opts=check_printf=0 %run %t 2>&1 | FileCheck %s
// RUN: %run %t 2>&1 | FileCheck %s
#include <stdio.h>
OpenPOWER on IntegriCloud