diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2016-02-21 13:53:12 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2016-02-21 13:53:12 +0000 |
| commit | c003a57e2e4a1ad9be0338806bc1038b6987155f (patch) | |
| tree | cf295e125457815f2b478811e8414810b8ed7c14 /test/tsan | |
| parent | 48f79c11890f23f47fbe89ec54a57d5cd485a7b1 (diff) | |
| download | src-c003a57e2e4a1ad9be0338806bc1038b6987155f.tar.gz src-c003a57e2e4a1ad9be0338806bc1038b6987155f.zip | |
Vendor import of compiler-rt release_38 branch r261369:vendor/compiler-rt/compiler-rt-release_380-r262564vendor/compiler-rt/compiler-rt-release_38-r261369
Notes
Notes:
svn path=/vendor/compiler-rt/dist/; revision=295850
svn path=/vendor/compiler-rt/compiler-rt-release_380-r262564/; revision=296362; tag=vendor/compiler-rt/compiler-rt-release_380-r262564
Diffstat (limited to 'test/tsan')
| -rw-r--r-- | test/tsan/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | test/tsan/ignore_lib0.cc | 4 | ||||
| -rw-r--r-- | test/tsan/printf-1.c | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/test/tsan/CMakeLists.txt b/test/tsan/CMakeLists.txt index f45a6fc59121..a058602659c1 100644 --- a/test/tsan/CMakeLists.txt +++ b/test/tsan/CMakeLists.txt @@ -47,6 +47,7 @@ if(COMPILER_RT_INCLUDE_TESTS) ${CMAKE_CURRENT_SOURCE_DIR}/Unit/lit.site.cfg.in ${CMAKE_CURRENT_BINARY_DIR}/Unit/lit.site.cfg) list(APPEND TSAN_TEST_DEPS TsanUnitTests) + list(APPEND TSAN_TESTSUITES ${CMAKE_CURRENT_BINARY_DIR}/Unit) endif() add_lit_testsuite(check-tsan "Running ThreadSanitizer tests" diff --git a/test/tsan/ignore_lib0.cc b/test/tsan/ignore_lib0.cc index c72aa496a1cd..d6ae72f31638 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 9116c956e30e..c8414f834b44 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> |