diff options
| author | James Barford-Evans <james.barford-evans@arm.com> | 2025-05-01 14:15:34 +0100 |
|---|---|---|
| committer | Amanieu d'Antras <amanieu@gmail.com> | 2025-05-03 05:06:15 +0000 |
| commit | 206c35a3a287970c680d355aed039df53cfdc2c4 (patch) | |
| tree | be4621bf37e73d4f3b9213b29fc60bd5ed8f009f | |
| parent | 052293b0927e764c502c759cea87a75afd7a020a (diff) | |
| download | rust-206c35a3a287970c680d355aed039df53cfdc2c4.tar.gz rust-206c35a3a287970c680d355aed039df53cfdc2c4.zip | |
change how the test is run
| -rw-r--r-- | library/stdarch/.github/workflows/main.yml | 3 | ||||
| -rw-r--r-- | library/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 a9ba24aad5c..88dc7b865a4 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 64fcd562941..e398db0e905 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), |