From 88522158b2a7462418b89ddd7424502ee60535b4 Mon Sep 17 00:00:00 2001 From: bjorn3 <17426603+bjorn3@users.noreply.github.com> Date: Mon, 26 Sep 2022 16:21:57 +0000 Subject: [PATCH] Re-enable structs abi-cafe test on AArch64 --- patches/0001-abi-cafe-Disable-failing-tests.patch | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/patches/0001-abi-cafe-Disable-failing-tests.patch b/patches/0001-abi-cafe-Disable-failing-tests.patch index 511d2f536fd..a6bcade8eb8 100644 --- a/patches/0001-abi-cafe-Disable-failing-tests.patch +++ b/patches/0001-abi-cafe-Disable-failing-tests.patch @@ -11,7 +11,7 @@ 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 +@@ -45,6 +45,13 @@ pub fn get_test_rules(test: &TestKey, caller: &dyn AbiImpl, callee: &dyn AbiImpl // // THIS AREA RESERVED FOR VENDORS TO APPLY PATCHES @@ -21,13 +21,6 @@ index 7346f5e..8347762 100644 + 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 //