Skip to content

Commit 041666a

Browse files
committed
Update abi-cafe ui128 test expectations
1 parent 6ec27fe commit 041666a

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

build_system/abi_cafe.rs

+7-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,13 @@ pub(crate) fn run(
4343
let mut cmd = ABI_CAFE.run(bootstrap_host_compiler, dirs);
4444
cmd.arg("--");
4545
cmd.arg("--pairs");
46-
cmd.args(pairs);
46+
cmd.args(
47+
if cfg!(not(any(target_os = "macos", all(target_os = "windows", target_env = "msvc")))) {
48+
&pairs[..]
49+
} else {
50+
&pairs[..2]
51+
},
52+
);
4753
cmd.arg("--add-rustc-codegen-backend");
4854
match cg_clif_dylib {
4955
CodegenBackend::Local(path) => {

patches/0001-abi-cafe-Disable-some-test-on-x86_64-pc-windows-gnu.patch

+4-1
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,17 @@ diff --git a/src/report.rs b/src/report.rs
1111
index eeec614..f582867 100644
1212
--- a/src/report.rs
1313
+++ b/src/report.rs
14-
@@ -48,6 +48,12 @@ pub fn get_test_rules(test: &TestKey, caller: &dyn AbiImpl, callee: &dyn AbiImpl
14+
@@ -48,6 +48,15 @@ pub fn get_test_rules(test: &TestKey, caller: &dyn AbiImpl, callee: &dyn AbiImpl
1515
//
1616
// THIS AREA RESERVED FOR VENDORS TO APPLY PATCHES
1717

1818
+ // x86_64-pc-windows-gnu has some broken i128 tests that aren't disabled by default
1919
+ if cfg!(all(target_os = "windows", target_env = "gnu")) && test.test_name == "ui128" {
2020
+ result.run = Link;
2121
+ result.check = Pass(Link);
22+
+ } else if test.test_name == "ui128" {
23+
+ result.run == Check;
24+
+ result.check = Pass(Check);
2225
+ }
2326
+
2427
// END OF VENDOR RESERVED AREA

0 commit comments

Comments
 (0)