Skip to content

Commit bc9d4a4

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

File tree

1 file changed

+1
-27
lines changed

1 file changed

+1
-27
lines changed

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

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -23,49 +23,23 @@ 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,32 @@ 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")) {
4137
+ if test.test == "SingleVariantUnion" && test.options.convention == CallingConvention::C && test.options.repr == LangRepr::C {
4238
+ result.check = Busted(Check);
4339
+ }
44-
+
45-
+ if test.test == "OptionU128" && test.caller == "rustc" && test.options.convention == CallingConvention::Rust && test.options.repr == LangRepr::C {
46-
+ result.check = Busted(Run);
47-
+ }
48-
+
49-
+ if test.test == "OptionU128" && test.caller == "cgclif" && test.options.convention == CallingConvention::Rust && test.options.repr == LangRepr::C {
50-
+ result.check = Busted(Check);
51-
+ }
52-
+ }
53-
+
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-
+ }
5840
+ }
5941
+
6042
+ 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-
+
6943
+ if test.test == "simple" && test.options.convention == CallingConvention::Rust {
7044
+ result.check = Busted(Check);
7145
+ }

0 commit comments

Comments
 (0)