From 206c35a3a287970c680d355aed039df53cfdc2c4 Mon Sep 17 00:00:00 2001 From: James Barford-Evans Date: Thu, 1 May 2025 14:15:34 +0100 Subject: [PATCH] change how the test is run --- library/stdarch/.github/workflows/main.yml | 3 +-- .../stdarch/crates/intrinsic-test/src/main.rs | 26 +++++-------------- 2 files changed, 8 insertions(+), 21 deletions(-) diff --git a/library/stdarch/.github/workflows/main.yml b/library/stdarch/.github/workflows/main.yml index a9ba24aad5c0..88dc7b865a4d 100644 --- a/library/stdarch/.github/workflows/main.yml +++ b/library/stdarch/.github/workflows/main.yml @@ -56,8 +56,7 @@ jobs: os: ubuntu-latest - tuple: aarch64-unknown-linux-gnu os: ubuntu-latest - - target: - tuple: aarch64_be-unknown-linux-gnu + - tuple: aarch64_be-unknown-linux-gnu os: ubuntu-latest - tuple: riscv64gc-unknown-linux-gnu os: ubuntu-latest diff --git a/library/stdarch/crates/intrinsic-test/src/main.rs b/library/stdarch/crates/intrinsic-test/src/main.rs index 64fcd5629419..e398db0e905e 100644 --- a/library/stdarch/crates/intrinsic-test/src/main.rs +++ b/library/stdarch/crates/intrinsic-test/src/main.rs @@ -594,29 +594,17 @@ fn compare_outputs( )) .output(); - let rust = if target != "aarch64_be-unknown-linux-gnu" { - Command::new("sh") - .current_dir("rust_programs") - .arg("-c") - .arg(format!( + let rust = Command::new("sh") + .current_dir("rust_programs") + .arg("-c") + .arg(format!( "cargo {toolchain} run --target {target} --bin {intrinsic} --release", intrinsic = intrinsic.name, toolchain = toolchain, target = target - )) - .env("RUSTFLAGS", "-Cdebuginfo=0") - .output() - } else { - Command::new("sh") - .arg("-c") - .arg(format!( - "{runner} ./rust_programs/target/{target}/release/{intrinsic}", - runner = runner, - target = target, - intrinsic = intrinsic.name, - )) - .output() - }; + )) + .env("RUSTFLAGS", "-Cdebuginfo=0") + .output(); let (c, rust) = match (c, rust) { (Ok(c), Ok(rust)) => (c, rust),