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

Merge pull request #1515 from lqd/abi-cafe

Browse Source 
enable abi-cafe tests on `aarch64-apple-darwin`
This commit is contained in:
bjorn3 2024-08-05 19:14:01 +02:00 committed by GitHub
commit 747adbdbe8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 30 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.github/workflows/abi-cafe.yml vendored
View File

@ -27,6 +27,9 @@ jobs:
- os: macos-latest - os: macos-latest
env: env:
TARGET_TRIPLE: x86_64-apple-darwin TARGET_TRIPLE: x86_64-apple-darwin
- os: macos-latest
env:
TARGET_TRIPLE: aarch64-apple-darwin
- os: windows-latest - os: windows-latest
env: env:
TARGET_TRIPLE: x86_64-pc-windows-msvc TARGET_TRIPLE: x86_64-pc-windows-msvc

3
build_system/abi_cafe.rs
View File

@ -1,4 +1,4 @@
use crate::path::Dirs; use crate::path::{Dirs, RelPath};
use crate::prepare::GitRepo; use crate::prepare::GitRepo;
use crate::utils::{spawn_and_wait, CargoProject, Compiler}; use crate::utils::{spawn_and_wait, CargoProject, Compiler};
use crate::{build_sysroot, CodegenBackend, SysrootKind}; use crate::{build_sysroot, CodegenBackend, SysrootKind};
@ -21,6 +21,7 @@ pub(crate) fn run(
rustup_toolchain_name: Option<&str>, rustup_toolchain_name: Option<&str>,
bootstrap_host_compiler: &Compiler, bootstrap_host_compiler: &Compiler,
) { ) {
RelPath::DOWNLOAD.ensure_exists(dirs);
ABI_CAFE_REPO.fetch(dirs); ABI_CAFE_REPO.fetch(dirs);
ABI_CAFE_REPO.patch(dirs); ABI_CAFE_REPO.patch(dirs);

35
patches/0002-abi-cafe-Disable-broken-tests.patch
View File

@ -1,27 +1,42 @@
From 378d9e451a8af1045b8cb32841198cd5ad5464a3 Mon Sep 17 00:00:00 2001 From 236df390f3bc4ed69c26f4d51d584bea246da886 Mon Sep 17 00:00:00 2001
From: bjorn3 <17426603+bjorn3@users.noreply.github.com> From: bjorn3 <17426603+bjorn3@users.noreply.github.com>
Date: Tue, 9 Jul 2024 11:25:14 +0000 Date: Tue, 9 Jul 2024 11:25:14 +0000
Subject: [PATCH] Disable broken tests Subject: [PATCH] Disable broken tests
--- ---
src/abis/mod.rs | 6 +++--- src/report.rs | 36 ++++++++++++++++++++++++++++++++++++
src/report.rs | 4 ++++ 1 file changed, 36 insertions(+)
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/report.rs b/src/report.rs diff --git a/src/report.rs b/src/report.rs
index acfce38..b3ab842 100644 index 958ab43..dcf1044 100644
--- a/src/report.rs --- a/src/report.rs
+++ b/src/report.rs +++ b/src/report.rs
@@ -45,6 +45,26 @@ pub fn get_test_rules(test: &TestKey, caller: &dyn AbiImpl, callee: &dyn AbiImpl @@ -48,6 +48,42 @@ pub fn get_test_rules(test: &TestKey, caller: &dyn Toolchain, callee: &dyn Toolc
// //
// THIS AREA RESERVED FOR VENDORS TO APPLY PATCHES // THIS AREA RESERVED FOR VENDORS TO APPLY PATCHES
+ if cfg!(target_arch = "aarch64") && test.test == "F32Array" && test.options.convention == CallingConvention::C { + if cfg!(all(target_arch = "aarch64", target_os = "linux")) {
+ result.check = Busted(Check); + if test.test == "F32Array" && test.options.convention == CallingConvention::C {
+ result.check = Busted(Check);
+ }
+
+ if test.test == "OptionU128" && test.options.convention == CallingConvention::Rust && test.options.repr == LangRepr::C {
+ result.check = Busted(Check);
+ }
+ } + }
+ +
+ if cfg!(target_arch = "aarch64") && test.test == "OptionU128" && test.options.convention == CallingConvention::Rust && test.options.repr == LangRepr::C { + if cfg!(all(target_arch = "aarch64", target_os = "macos")) {
+ result.check = Busted(Check); + if test.test == "SingleVariantUnion" && test.options.convention == CallingConvention::C && test.options.repr == LangRepr::C {
+ result.check = Busted(Check);
+ }
+
+ if test.test == "OptionU128" && test.caller == "rustc" && test.options.convention == CallingConvention::Rust && test.options.repr == LangRepr::C {
+ result.check = Busted(Run);
+ }
+
+ if test.test == "OptionU128" && test.caller == "cgclif" && test.options.convention == CallingConvention::Rust && test.options.repr == LangRepr::C {
+ result.check = Busted(Check);
+ }
+ } + }
+ +
+ if cfg!(target_arch = "x86_64") && test.test == "OptionU128" && test.options.convention == CallingConvention::Rust && test.options.repr == LangRepr::Rust { + if cfg!(target_arch = "x86_64") && test.test == "OptionU128" && test.options.convention == CallingConvention::Rust && test.options.repr == LangRepr::Rust {