Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions .github/workflows/stdarch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,14 @@ jobs:
- name: Install more recent binutils
run: |
echo "deb http://archive.ubuntu.com/ubuntu plucky main universe" | sudo tee /etc/apt/sources.list.d/plucky-copies.list
sudo apt-get update
sudo apt-get update -o Acquire::Retries=3
sudo apt-get install binutils
installed="$(dpkg-query --showformat='${Version}' --show binutils)"
echo "Installed binutils: $installed"
if dpkg --compare-versions "$installed" lt "2.44"; then
echo "::error::binutils upgrade failed (got $installed, need >= 2.44); the apt fetch probably failed"
exit 1
fi

- name: Install Intel Software Development Emulator
if: ${{ matrix.cargo_runner }}
Expand Down Expand Up @@ -89,7 +95,8 @@ jobs:
- name: Run stdarch tests
if: ${{ !matrix.cargo_runner }}
run: |
./y.sh test --release --stdarch-tests
# FIXME: remove --skip test_tile_ and --skip --skip test__tile when it's implemented.
./y.sh test --release --stdarch-tests -- --skip test_tile_ --skip test__tile

- name: Run stdarch tests
if: ${{ matrix.cargo_runner }}
Expand Down
8 changes: 7 additions & 1 deletion build_system/src/test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -788,7 +788,13 @@ fn test_stdarch(env: &Env, args: &TestArg) -> Result<(), String> {
format!("{rustflags} -Ainternal_features").trim().to_owned(),
);
env.insert("TARGET".to_string(), args.config_info.target_triple.clone());
run_cargo_command(&[&"test", &"--manifest-path", &manifest_path], None, &env, args)?;

let mut command: Vec<&dyn AsRef<OsStr>> =
vec![&"test", &"--manifest-path", &manifest_path, &"--"];
for test_name in &args.test_args {
command.push(test_name);
}
run_cargo_command(&command, None, &env, args)?;
Ok(())
}

Expand Down
Loading