From 58618fe111448a7d347bb584693ed1b27cf00bb4 Mon Sep 17 00:00:00 2001 From: Aiden Grossman Date: Wed, 5 Nov 2025 20:56:42 +0000 Subject: [PATCH 1/2] =?UTF-8?q?[=F0=9D=98=80=F0=9D=97=BD=F0=9D=97=BF]=20ch?= =?UTF-8?q?anges=20to=20main=20this=20commit=20is=20based=20on?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Created using spr 1.3.7 [skip ci] --- compiler-rt/test/hwasan/TestCases/Linux/fixed-shadow.c | 6 ++---- compiler-rt/test/profile/instrprof-tmpdir.c | 8 ++++++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/compiler-rt/test/hwasan/TestCases/Linux/fixed-shadow.c b/compiler-rt/test/hwasan/TestCases/Linux/fixed-shadow.c index fc83b213561c8..08a04fc305ffb 100644 --- a/compiler-rt/test/hwasan/TestCases/Linux/fixed-shadow.c +++ b/compiler-rt/test/hwasan/TestCases/Linux/fixed-shadow.c @@ -3,12 +3,12 @@ // Default compiler instrumentation works with any shadow base (dynamic or fixed). // RUN: %clang_hwasan %s -o %t // RUN: %run %t -// RUN: env HWASAN_OPTIONS=fixed_shadow_base=263878495698944 %run %t 2>%t.out || (cat %t.out | FileCheck %s) +// RUN: env HWASAN_OPTIONS=fixed_shadow_base=263878495698944 %run %t // RUN: env HWASAN_OPTIONS=fixed_shadow_base=4398046511104 %run %t // // If -hwasan-mapping-offset is set, then the fixed_shadow_base needs to match. // RUN: %clang_hwasan %s -mllvm -hwasan-mapping-offset=263878495698944 -o %t -// RUN: env HWASAN_OPTIONS=fixed_shadow_base=263878495698944 %run %t 2>%t.out || (cat %t.out | FileCheck %s) +// RUN: env HWASAN_OPTIONS=fixed_shadow_base=263878495698944 %run %t // RUN: env HWASAN_OPTIONS=fixed_shadow_base=4398046511104 not %run %t // RUN: %clang_hwasan %s -mllvm -hwasan-mapping-offset=4398046511104 -o %t @@ -26,8 +26,6 @@ // // UNSUPPORTED: android -// CHECK: FATAL: HWAddressSanitizer: Shadow range {{.*}} is not available - #include #include #include diff --git a/compiler-rt/test/profile/instrprof-tmpdir.c b/compiler-rt/test/profile/instrprof-tmpdir.c index 7206df3c2eb0c..9d4b3d35e94e7 100644 --- a/compiler-rt/test/profile/instrprof-tmpdir.c +++ b/compiler-rt/test/profile/instrprof-tmpdir.c @@ -1,3 +1,8 @@ +// AIX does not support env -u. +// TODO(boomanaiden154): Reenable AIX support once we use the internal shell by +// default. +// UNSUPPORTED: system-aix + // RUN: rm -rf %t // RUN: mkdir -p %t // RUN: cd %t @@ -12,8 +17,7 @@ // RUN: llvm-profdata show ./raw2.profraw | FileCheck %s -check-prefix TMPDIR // // Check that we fall back to the default path if TMPDIR is missing. -// RUN: %if system-aix %{ unset TMPDIR %} -// RUN: env %if !system-aix %{ -u TMPDIR %} LLVM_PROFILE_FILE="%%t/raw3.profraw" %run %t/binary 2>&1 | FileCheck %s -check-prefix MISSING +// RUN: env -u TMPDIR LLVM_PROFILE_FILE="%%t/raw3.profraw" %run %t/binary 2>&1 | FileCheck %s -check-prefix MISSING // RUN: llvm-profdata show ./default.profraw | FileCheck %s -check-prefix TMPDIR // TMPDIR: Maximum function count: 1 From 1873f39859a3a83d1b07f863d20547b78be78101 Mon Sep 17 00:00:00 2001 From: Aiden Grossman Date: Fri, 7 Nov 2025 19:49:31 +0000 Subject: [PATCH 2/2] fix Created using spr 1.3.7 --- .../TestCases/Posix/sanitizer_set_report_fd_test.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compiler-rt/test/sanitizer_common/TestCases/Posix/sanitizer_set_report_fd_test.cpp b/compiler-rt/test/sanitizer_common/TestCases/Posix/sanitizer_set_report_fd_test.cpp index 68e76bb49f631..e4064828015aa 100644 --- a/compiler-rt/test/sanitizer_common/TestCases/Posix/sanitizer_set_report_fd_test.cpp +++ b/compiler-rt/test/sanitizer_common/TestCases/Posix/sanitizer_set_report_fd_test.cpp @@ -7,7 +7,7 @@ // RUN: not %run %t %t-out && FileCheck < %t-out %s // REQUIRES: stable-runtime -// UNSUPPORTED: android +// UNSUPPORTED: android && asan #include #include