diff options
| author | Hans Wennborg <hans@hanshq.net> | 2016-02-19 19:43:25 +0000 |
|---|---|---|
| committer | Hans Wennborg <hans@hanshq.net> | 2016-02-19 19:43:25 +0000 |
| commit | 31769223eb782e7b03655810d00dfdec66467d51 (patch) | |
| tree | a31acad0e7e04d158dd5535ff1ae43c6140b3922 | |
| parent | 59150bfe2493620112d9787be644becce3571686 (diff) | |
| download | compiler-rt-31769223eb782e7b03655810d00dfdec66467d51.tar.gz | |
Merging r261148:
------------------------------------------------------------------------
r261148 | samsonov | 2016-02-17 12:40:10 -0800 (Wed, 17 Feb 2016) | 1 line
[TSan] PR26609: Fix two test cases.
------------------------------------------------------------------------
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/branches/release_38@261359 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | test/tsan/ignore_lib0.cc | 4 | ||||
| -rw-r--r-- | test/tsan/printf-1.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/test/tsan/ignore_lib0.cc b/test/tsan/ignore_lib0.cc index c72aa496a..d6ae72f31 100644 --- a/test/tsan/ignore_lib0.cc +++ b/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/test/tsan/printf-1.c b/test/tsan/printf-1.c index 9116c956e..c8414f834 100644 --- a/test/tsan/printf-1.c +++ b/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> |