Skip to content

Conversation

@qinkunbao
Copy link
Member

@qinkunbao qinkunbao commented Jun 28, 2025

See #125924

I didn't test it as I don't have access to a windows machine.

Created using spr 1.3.6
@llvmbot
Copy link
Member

llvmbot commented Jun 28, 2025

@llvm/pr-subscribers-compiler-rt-sanitizer

Author: Qinkun Bao (qinkunbao)

Changes

See #125924


Full diff: https://github.com/llvm/llvm-project/pull/146181.diff

1 Files Affected:

  • (modified) compiler-rt/test/fuzzer/uncaught-exception.test (+2-4)
diff --git a/compiler-rt/test/fuzzer/uncaught-exception.test b/compiler-rt/test/fuzzer/uncaught-exception.test
index d1b98cfb7c74b..337267fc947ac 100644
--- a/compiler-rt/test/fuzzer/uncaught-exception.test
+++ b/compiler-rt/test/fuzzer/uncaught-exception.test
@@ -6,8 +6,6 @@ RUN: %cpp_compiler %S/UncaughtException.cpp -o %t-UncaughtException
 
 # Clang will fail the test with 'deadly signal', but other compilers may fail with different error messages.
 # For example, msvc fails with 'uncaught C++ exception'. So the error we check depends on the compiler target.
-RUN: not %run %t-UncaughtException 2>&1 | FileCheck %s --check-prefixes=CHECK-CRASH,%if target={{.*-windows-msvc.*}} %{CHECK-MSVC%} %else %{CHECK-ERROR%}
+RUN: not %run %t-UncaughtException 2>&1 | FileCheck %s
 
-CHECK-ERROR: ERROR: libFuzzer: deadly signal
-CHECK-MSVC: ERROR: libFuzzer: uncaught C++ exception
-CHECK-CRASH: Test unit written to ./crash
+CHECK: {{{{.*}}ERROR: libFuzzer: deadly signal|{{.*}}ERROR: libFuzzer: uncaught C++ exception}} 

@qinkunbao qinkunbao marked this pull request as draft June 28, 2025 00:58
Created using spr 1.3.6
@qinkunbao qinkunbao marked this pull request as ready for review June 28, 2025 01:03
Created using spr 1.3.6
Created using spr 1.3.6
@qinkunbao qinkunbao merged commit 72060f1 into main Jun 28, 2025
5 of 7 checks passed
@qinkunbao qinkunbao deleted the users/qinkunbao/spr/fix-uncaught-exceptiontest-2 branch June 28, 2025 02:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants