Skip to content

Commit 45c2002

Browse files
committed
Update abi-cafe test expectations for a recent fix of the rust abi
1 parent 04f33cc commit 45c2002

File tree

1 file changed

+1
-19
lines changed

1 file changed

+1
-19
lines changed

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

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,14 @@ diff --git a/src/report.rs b/src/report.rs
2323
index 958ab43..dcf1044 100644
2424
--- a/src/report.rs
2525
+++ b/src/report.rs
26-
@@ -48,6 +48,58 @@ pub fn get_test_rules(test: &TestKey, caller: &dyn Toolchain, callee: &dyn Toolc
26+
@@ -48,6 +48,40 @@ pub fn get_test_rules(test: &TestKey, caller: &dyn Toolchain, callee: &dyn Toolc
2727
//
2828
// THIS AREA RESERVED FOR VENDORS TO APPLY PATCHES
2929

3030
+ if cfg!(all(target_arch = "aarch64", target_os = "linux")) {
3131
+ if test.test == "F32Array" && test.options.convention == CallingConvention::C {
3232
+ result.check = Busted(Check);
3333
+ }
34-
+
35-
+ if test.test == "OptionU128" && test.options.convention == CallingConvention::Rust && test.options.repr == LangRepr::C {
36-
+ result.check = Busted(Check);
37-
+ }
3834
+ }
3935
+
4036
+ if cfg!(all(target_arch = "aarch64", target_os = "macos")) {
@@ -51,21 +47,7 @@ index 958ab43..dcf1044 100644
5147
+ }
5248
+ }
5349
+
54-
+ if cfg!(all(target_arch = "x86_64", unix)) {
55-
+ if test.test == "OptionU128" && test.options.convention == CallingConvention::Rust && test.options.repr == LangRepr::Rust {
56-
+ result.check = Busted(Run);
57-
+ }
58-
+ }
59-
+
6050
+ if cfg!(all(target_arch = "x86_64", windows)) {
61-
+ if test.test == "OptionU128" && test.options.convention == CallingConvention::Rust {
62-
+ result.check = Busted(Check);
63-
+ }
64-
+
65-
+ if test.test == "OptionU128" && test.options.convention == CallingConvention::Rust && (test.caller == "rustc" || test.options.repr == LangRepr::Rust) {
66-
+ result.check = Busted(Run);
67-
+ }
68-
+
6951
+ if test.test == "simple" && test.options.convention == CallingConvention::Rust {
7052
+ result.check = Busted(Check);
7153
+ }

0 commit comments

Comments
 (0)