mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update abi-cafe ui128 test expectations

Browse Source
This commit is contained in:
bjorn3 2024-04-01 14:42:04 +02:00
parent 6ec27fe9da
commit 041666a0bd
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build_system/abi_cafe.rs
View File

@ -43,7 +43,13 @@ pub(crate) fn run(
let mut cmd = ABI_CAFE.run(bootstrap_host_compiler, dirs); let mut cmd = ABI_CAFE.run(bootstrap_host_compiler, dirs);
cmd.arg("--"); cmd.arg("--");
cmd.arg("--pairs"); cmd.arg("--pairs");
cmd.args(pairs); cmd.args(
if cfg!(not(any(target_os = "macos", all(target_os = "windows", target_env = "msvc")))) {
&pairs[..]
} else {
&pairs[..2]
},
);
cmd.arg("--add-rustc-codegen-backend"); cmd.arg("--add-rustc-codegen-backend");
match cg_clif_dylib { match cg_clif_dylib {
CodegenBackend::Local(path) => { CodegenBackend::Local(path) => {

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

@ -11,7 +11,7 @@ diff --git a/src/report.rs b/src/report.rs
index eeec614..f582867 100644 index eeec614..f582867 100644
--- a/src/report.rs --- a/src/report.rs
+++ b/src/report.rs +++ b/src/report.rs
@@ -48,6 +48,12 @@ pub fn get_test_rules(test: &TestKey, caller: &dyn AbiImpl, callee: &dyn AbiImpl @@ -48,6 +48,15 @@ pub fn get_test_rules(test: &TestKey, caller: &dyn AbiImpl, callee: &dyn AbiImpl
// //
// THIS AREA RESERVED FOR VENDORS TO APPLY PATCHES // THIS AREA RESERVED FOR VENDORS TO APPLY PATCHES
@ -19,6 +19,9 @@ index eeec614..f582867 100644
+ if cfg!(all(target_os = "windows", target_env = "gnu")) && test.test_name == "ui128" { + if cfg!(all(target_os = "windows", target_env = "gnu")) && test.test_name == "ui128" {
+ result.run = Link; + result.run = Link;
+ result.check = Pass(Link); + result.check = Pass(Link);
+ } else if test.test_name == "ui128" {
+ result.run == Check;
+ result.check = Pass(Check);
+ } + }
+ +
// END OF VENDOR RESERVED AREA // END OF VENDOR RESERVED AREA