[compiler-rt] cc8478b - Revert "[compiler-rt][HWAsan] Remove CHECK lines from test"

[Aiden Grossman via llvm-commits]

Author: Aiden Grossman
Date: 2025-11-06T09:48:44Z
New Revision: cc8478b38d9dc72f4f3b38bbaa55718663523277

URL: https://github.com/llvm/llvm-project/commit/cc8478b38d9dc72f4f3b38bbaa55718663523277
DIFF: https://github.com/llvm/llvm-project/commit/cc8478b38d9dc72f4f3b38bbaa55718663523277.diff

LOG: Revert "[compiler-rt][HWAsan] Remove CHECK lines from test"

This reverts commit 9f5811ec6bd5e9f99dd22c4a06e6e984cb15ae4b.

It looks like this caused some test failures:
1. https://lab.llvm.org/buildbot/#/builders/51/builds/26529
2. https://lab.llvm.org/buildbot/#/builders/198/builds/9462

Added: 
    

Modified: 
    compiler-rt/test/hwasan/TestCases/Linux/fixed-shadow.c

Removed: 
    


################################################################################
diff  --git a/compiler-rt/test/hwasan/TestCases/Linux/fixed-shadow.c b/compiler-rt/test/hwasan/TestCases/Linux/fixed-shadow.c
index 08a04fc305ffb..fc83b213561c8 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
+// 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=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
+// 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=4398046511104 not %run %t
 
 // RUN: %clang_hwasan %s -mllvm -hwasan-mapping-offset=4398046511104 -o %t
@@ -26,6 +26,8 @@
 //
 // UNSUPPORTED: android
 
+// CHECK: FATAL: HWAddressSanitizer: Shadow range {{.*}} is not available
+
 #include <assert.h>
 #include <sanitizer/allocator_interface.h>
 #include <sanitizer/hwasan_interface.h>