Skip to content

Commit 69c6749

Browse files
committed
Disable some abi-checker tests
1 parent 0706df5 commit 69c6749

File tree

2 files changed

+37
-0
lines changed

2 files changed

+37
-0
lines changed

build_system/prepare.rs

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ pub(crate) fn prepare() {
2020
"abi-checker",
2121
"a2232d45f202846f5c02203c9f27355360f9a2ff",
2222
);
23+
apply_patches("abi-checker", Path::new("abi-checker"));
2324

2425
clone_repo_shallow_github(
2526
"rand",
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
From 1a315ba225577dbbd1f449d9609f16f984f68708 Mon Sep 17 00:00:00 2001
2+
From: Afonso Bordado <[email protected]>
3+
Date: Fri, 12 Aug 2022 22:51:58 +0000
4+
Subject: [PATCH] Disable abi-checker tests
5+
6+
---
7+
src/report.rs | 14 ++++++++++++++
8+
1 file changed, 14 insertions(+)
9+
10+
diff --git a/src/report.rs b/src/report.rs
11+
index 7346f5e..8347762 100644
12+
--- a/src/report.rs
13+
+++ b/src/report.rs
14+
@@ -45,6 +45,20 @@ pub fn get_test_rules(test: &TestKey, caller: &dyn AbiImpl, callee: &dyn AbiImpl
15+
//
16+
// THIS AREA RESERVED FOR VENDORS TO APPLY PATCHES
17+
18+
+ // Currently MSVC has some broken ABI issues. Furthermore, they cause
19+
+ // a STATUS_ACCESS_VIOLATION, so we can't even run them. Ensure that they compile and link.
20+
+ if cfg!(windows) && (test.test_name == "bool" || test.test_name == "ui128") {
21+
+ result.run = Link;
22+
+ result.check = Pass(Link);
23+
+ }
24+
+
25+
+ // structs is broken in the current release of cranelift for aarch64.
26+
+ // It has been fixed for cranelift 0.88: https://github.com/bytecodealliance/wasmtime/pull/4634
27+
+ if cfg!(target_arch = "aarch64") && test.test_name == "structs" {
28+
+ result.run = Link;
29+
+ result.check = Pass(Link);
30+
+ }
31+
+
32+
// END OF VENDOR RESERVED AREA
33+
//
34+
//
35+
--
36+
2.34.1

0 commit comments

Comments
 (0)