Skip to content

Commit 39f08eb

Browse files
Revert "[TSan] Make Test work with Internal Shell"
This reverts commit 8761693. This broke a buildbot. Reverting so I can ensure I'm comitting with the proper fix given this didn't reporoduce locally on my Linux box. https://lab.llvm.org/buildbot/#/builders/174/builds/26760
1 parent 855a3e9 commit 39f08eb

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

compiler-rt/test/tsan/ignore_lib0.cpp

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,11 @@
44
// RUN: %clangxx_tsan -O1 -fno-builtin %s -DLIB -fPIC -fno-sanitize=thread -shared -o %t-dir/libignore_lib0.so
55
// RUN: %clangxx_tsan -O1 %s -L%t-dir -lignore_lib0 %link_libcxx_tsan -o %t
66
// RUN: echo running w/o suppressions:
7-
// RUN: echo -n %t-dir > %t.ld_library_path
8-
// RUN: python -c "if 'LD_LIBRARY_PATH' in __import__('os').environ: print(':' + __import__('os').environ['LD_LIBRARY_PATH'], end='')" >> %t.ld_library_path
9-
// RUN: env LD_LIBRARY_PATH=%{readfile:%t.ld_library_path} %deflake %run %t | FileCheck %s --check-prefix=CHECK-NOSUPP
7+
// RUN: env LD_LIBRARY_PATH=%t-dir${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} %deflake %run %t | FileCheck %s --check-prefix=CHECK-NOSUPP
108
// RUN: echo running with suppressions:
11-
// RUN: env LD_LIBRARY_PATH=%{readfile:%t.ld_library_path} %env_tsan_opts=suppressions='%s.supp' %run %t 2>&1 | FileCheck %s --check-prefix=CHECK-WITHSUPP
9+
// RUN: env LD_LIBRARY_PATH=%t-dir${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} %env_tsan_opts=suppressions='%s.supp' %run %t 2>&1 | FileCheck %s --check-prefix=CHECK-WITHSUPP
1210
// RUN: echo running with generic suppression of noninstrumented code:
13-
// RUN: env LD_LIBRARY_PATH=%{readfile:%t.ld_library_path} %env_tsan_opts=ignore_noninstrumented_modules=1 %run %t 2>&1 | FileCheck %s --check-prefix=CHECK-WITHSUPP
11+
// RUN: env LD_LIBRARY_PATH=%t-dir${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} %env_tsan_opts=ignore_noninstrumented_modules=1 %run %t 2>&1 | FileCheck %s --check-prefix=CHECK-WITHSUPP
1412

1513
// Tests that interceptors coming from a library specified in called_from_lib
1614
// suppression are ignored.

0 commit comments

Comments
 (0)