Skip to content

Commit 52f1ea4

Browse files
committed
Don't skip running abi-cafe tests that give SIGILL on Windows
1 parent 747adbd commit 52f1ea4

File tree

1 file changed

+21
-5
lines changed

1 file changed

+21
-5
lines changed

patches/0002-abi-cafe-Disable-broken-tests.patch

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ diff --git a/src/report.rs b/src/report.rs
1111
index 958ab43..dcf1044 100644
1212
--- a/src/report.rs
1313
+++ b/src/report.rs
14-
@@ -48,6 +48,42 @@ pub fn get_test_rules(test: &TestKey, caller: &dyn Toolchain, callee: &dyn Toolc
14+
@@ -48,6 +48,58 @@ pub fn get_test_rules(test: &TestKey, caller: &dyn Toolchain, callee: &dyn Toolc
1515
//
1616
// THIS AREA RESERVED FOR VENDORS TO APPLY PATCHES
1717

@@ -39,12 +39,28 @@ index 958ab43..dcf1044 100644
3939
+ }
4040
+ }
4141
+
42-
+ if cfg!(target_arch = "x86_64") && test.test == "OptionU128" && test.options.convention == CallingConvention::Rust && test.options.repr == LangRepr::Rust {
43-
+ result.check = Busted(Run);
42+
+ if cfg!(all(target_arch = "x86_64", unix)) {
43+
+ if test.test == "OptionU128" && test.options.convention == CallingConvention::Rust && test.options.repr == LangRepr::Rust {
44+
+ result.check = Busted(Run);
45+
+ }
4446
+ }
4547
+
46-
+ if cfg!(windows) && (test.test == "OptionU128" || test.test == "I64Array" || test.test == "simple") {
47-
+ result.run = Skip; // Gives SIGILL on x86_64 windows.
48+
+ if cfg!(all(target_arch = "x86_64", windows)) {
49+
+ if test.test == "OptionU128" && test.options.convention == CallingConvention::Rust {
50+
+ result.check = Busted(Check);
51+
+ }
52+
+
53+
+ if test.test == "OptionU128" && test.options.convention == CallingConvention::Rust && (test.caller == "rustc" || test.options.repr == LangRepr::Rust) {
54+
+ result.check = Busted(Run);
55+
+ }
56+
+
57+
+ if test.test == "simple" && test.options.convention == CallingConvention::Rust {
58+
+ result.check = Busted(Check);
59+
+ }
60+
+
61+
+ if test.test == "simple" && test.options.convention == CallingConvention::Rust && test.caller == "rustc" {
62+
+ result.check = Busted(Run);
63+
+ }
4864
+ }
4965
+
5066
+ if test.test == "f16" || test.test == "f128" {

0 commit comments

Comments
 (0)