From 69c6749aee93ee3c5dd3b9b394eef612d48dd6cd Mon Sep 17 00:00:00 2001 From: Afonso Bordado Date: Fri, 12 Aug 2022 23:47:12 +0100 Subject: [PATCH] Disable some abi-checker tests --- build_system/prepare.rs | 1 + ...29-abi-checker-Disable-failing-tests.patch | 36 +++++++++++++++++++ 2 files changed, 37 insertions(+) create mode 100644 patches/0029-abi-checker-Disable-failing-tests.patch diff --git a/build_system/prepare.rs b/build_system/prepare.rs index 24a233d3806..d23b7f00dcf 100644 --- a/build_system/prepare.rs +++ b/build_system/prepare.rs @@ -20,6 +20,7 @@ pub(crate) fn prepare() { "abi-checker", "a2232d45f202846f5c02203c9f27355360f9a2ff", ); + apply_patches("abi-checker", Path::new("abi-checker")); clone_repo_shallow_github( "rand", diff --git a/patches/0029-abi-checker-Disable-failing-tests.patch b/patches/0029-abi-checker-Disable-failing-tests.patch new file mode 100644 index 00000000000..526366a7598 --- /dev/null +++ b/patches/0029-abi-checker-Disable-failing-tests.patch @@ -0,0 +1,36 @@ +From 1a315ba225577dbbd1f449d9609f16f984f68708 Mon Sep 17 00:00:00 2001 +From: Afonso Bordado +Date: Fri, 12 Aug 2022 22:51:58 +0000 +Subject: [PATCH] Disable abi-checker tests + +--- + src/report.rs | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + +diff --git a/src/report.rs b/src/report.rs +index 7346f5e..8347762 100644 +--- a/src/report.rs ++++ b/src/report.rs +@@ -45,6 +45,20 @@ pub fn get_test_rules(test: &TestKey, caller: &dyn AbiImpl, callee: &dyn AbiImpl + // + // THIS AREA RESERVED FOR VENDORS TO APPLY PATCHES + ++ // Currently MSVC has some broken ABI issues. Furthermore, they cause ++ // a STATUS_ACCESS_VIOLATION, so we can't even run them. Ensure that they compile and link. ++ if cfg!(windows) && (test.test_name == "bool" || test.test_name == "ui128") { ++ result.run = Link; ++ result.check = Pass(Link); ++ } ++ ++ // structs is broken in the current release of cranelift for aarch64. ++ // It has been fixed for cranelift 0.88: https://github.com/bytecodealliance/wasmtime/pull/4634 ++ if cfg!(target_arch = "aarch64") && test.test_name == "structs" { ++ result.run = Link; ++ result.check = Pass(Link); ++ } ++ + // END OF VENDOR RESERVED AREA + // + // +-- +2.34.1