Skip to content

Commit d0ea42d

Browse files
cmticegithub-actions[bot]
authored andcommitted
Automerge: [compiler-rt] Update some tests to pass with lit internal shell. (#157910)
The lit internal shell needs environment variable definitions to be preceded by the 'env' keyword. This PR add that to tests that were missing it.
2 parents bc4df27 + 5ceb450 commit d0ea42d

File tree

6 files changed

+6
-6
lines changed

6 files changed

+6
-6
lines changed

compiler-rt/test/hwasan/TestCases/Posix/dlerror.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
// Android HWAsan does not support LSan.
55
// UNSUPPORTED: android
66

7-
// RUN: %clangxx_hwasan -O0 %s -o %t && HWASAN_OPTIONS=detect_leaks=1 %run %t
7+
// RUN: %clangxx_hwasan -O0 %s -o %t && env HWASAN_OPTIONS=detect_leaks=1 %run %t
88

99
#include <assert.h>
1010
#include <dlfcn.h>

compiler-rt/test/rtsan/unrecognized_flags.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// RUN: %clangxx -fsanitize=realtime %s -o %t
2-
// RUN: RTSAN_OPTIONS="verbosity=1,asdf=1" %run %t 2>&1 | FileCheck %s
2+
// RUN: env RTSAN_OPTIONS="verbosity=1,asdf=1" %run %t 2>&1 | FileCheck %s
33
// UNSUPPORTED: ios
44

55
// Intent: Make sure we are respecting some basic common flags

compiler-rt/test/xray/TestCases/Posix/dlopen.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
// RUN: %clangxx_xray -g -fPIC -fxray-instrument -fxray-shared -shared -std=c++11 %t/testlib.cpp -o %t/testlib.so
66
// RUN: %clangxx_xray -g -fPIC -rdynamic -fxray-instrument -fxray-shared -std=c++11 %t/main.cpp -o %t/main.o
77
//
8-
// RUN: XRAY_OPTIONS="patch_premain=true" %run %t/main.o %t/testlib.so 2>&1 | FileCheck %s
8+
// RUN: env XRAY_OPTIONS="patch_premain=true" %run %t/main.o %t/testlib.so 2>&1 | FileCheck %s
99

1010
// REQUIRES: target={{(aarch64|x86_64)-.*}}
1111

compiler-rt/test/xray/TestCases/Posix/dso-dep-chains.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
// Executable links with a and b explicitly and loads d and e at runtime.
1616
// RUN: %clangxx_xray -g -fPIC -rdynamic -fxray-instrument -fxray-shared -std=c++11 %t/main.cpp %t/testliba.so %t/testlibb.so -o %t/main.o
1717
//
18-
// RUN: XRAY_OPTIONS="patch_premain=true" %run %t/main.o %t/testlibd.so %t/testlibe.so 2>&1 | FileCheck %s
18+
// RUN: env XRAY_OPTIONS="patch_premain=true" %run %t/main.o %t/testlibd.so %t/testlibe.so 2>&1 | FileCheck %s
1919

2020
// REQUIRES: target={{(aarch64|x86_64)-.*}}
2121

compiler-rt/test/xray/TestCases/Posix/patch-premain-dso.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
// RUN: %clangxx_xray -g -fPIC -fxray-instrument -fxray-shared -shared -std=c++11 %t/testlib.cpp -o %t/testlib.so
55
// RUN: %clangxx_xray -g -fPIC -fxray-instrument -fxray-shared -std=c++11 %t/main.cpp %t/testlib.so -Wl,-rpath,%t -o %t/main.o
66

7-
// RUN: XRAY_OPTIONS="patch_premain=true,verbosity=1" %run %t/main.o 2>&1 | FileCheck %s
7+
// RUN: env XRAY_OPTIONS="patch_premain=true,verbosity=1" %run %t/main.o 2>&1 | FileCheck %s
88

99
// REQUIRES: target={{(aarch64|x86_64)-.*}}
1010

compiler-rt/test/xray/TestCases/Posix/patching-unpatching-dso.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// RUN: %clangxx_xray -g -fPIC -fxray-instrument -fxray-shared -shared -std=c++11 %t/testlib.cpp -o %t/testlib.so
77
// RUN: %clangxx_xray -g -fPIC -fxray-instrument -fxray-shared -std=c++11 %t/main.cpp %t/testlib.so -Wl,-rpath,%t -o %t/main.o
88

9-
// RUN: XRAY_OPTIONS="patch_premain=false" %run %t/main.o 2>&1 | FileCheck %s
9+
// RUN: env XRAY_OPTIONS="patch_premain=false" %run %t/main.o 2>&1 | FileCheck %s
1010

1111
// REQUIRES: target={{(aarch64|x86_64)-.*}}
1212

0 commit comments

Comments
 (0)