From 800d97b415912b3fc6d679e69524c89d1602b262 Mon Sep 17 00:00:00 2001 From: Trevor Gross Date: Sat, 13 Apr 2024 04:32:49 -0400 Subject: [PATCH 1/2] Change aarch64_linux module and lse tests to have the same gating Trying to run testcrate on non-linux aarch64 currently hits a compilation error. Make this test linux-only, to be consistent with the `aarch64_linux` module that it depends on. Additionally, enable the `aarch64_linux` module for `target_arch = "arm64ec"` to be the same as these tests. --- testcrate/tests/lse.rs | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/testcrate/tests/lse.rs b/testcrate/tests/lse.rs index 63c98957..cbecd614 100644 --- a/testcrate/tests/lse.rs +++ b/testcrate/tests/lse.rs @@ -1,8 +1,5 @@ #![feature(decl_macro)] // so we can use pub(super) -#![cfg(all( - any(target_arch = "aarch64", target_arch = "arm64ec"), - not(feature = "no-asm") -))] +#![cfg(all(target_arch = "aarch64", target_os = "linux", not(feature = "no-asm")))] /// Translate a byte size to a Rust type. macro int_ty { From 1e1376eea69f568f4492b2330ca73747086f474a Mon Sep 17 00:00:00 2001 From: Trevor Gross Date: Tue, 16 Apr 2024 03:04:37 -0400 Subject: [PATCH 2/2] Add CI testing for AArch64 Darwin The Apple ARM silicon has been around for a while now and hopefully will become Rust Tier 1 at some point. Add it to CI since it is distinct enough from aarch64-linux and x86_86-darwin that there may be differences. --- .github/workflows/main.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 97d298cf..57497e05 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -9,6 +9,9 @@ jobs: fail-fast: false matrix: include: + - target: aarch64-apple-darwin + os: macos-14 + rust: nightly - target: aarch64-unknown-linux-gnu os: ubuntu-latest rust: nightly @@ -81,6 +84,8 @@ jobs: os: windows-latest rust: nightly-x86_64-gnu steps: + - name: Print runner information + run: uname -a - uses: actions/checkout@v4 with: submodules: true