diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 4a9c955f6..81c524e38 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -48,7 +48,6 @@ jobs: - target: aarch64-pc-windows-msvc os: windows-latest ext: .exe - skip-test: true - target: x86_64-unknown-linux-gnu os: ubuntu-latest @@ -80,7 +79,6 @@ jobs: rustup toolchain install stable nightly --profile minimal -t ${{ matrix.target }} - name: Test on stable - if: ${{ ! matrix.skip-test }} run: | ${{ env.CARGO }} +stable test --target ${{ matrix.target }} $EXTRA_CARGO_FLAGS diff --git a/tests/ui.rs b/tests/ui.rs index c72f05224..85bea38c1 100644 --- a/tests/ui.rs +++ b/tests/ui.rs @@ -8,12 +8,8 @@ mod utils; use std::{io, path::Path, process::Output}; -#[cfg(not(windows))] use insta::assert_display_snapshot as ui; -// Don't run these on Windows -#[cfg(windows)] -use self::ignore as ui; use crate::utils::run_in; fn testdir() -> io::Result<(tempfile::TempDir, &'static Path)> { @@ -114,11 +110,3 @@ fn ui_test_usage_help_flag() { ui!(output_to_string(ouch!("--help"))); ui!(output_to_string(ouch!("-h"))); } - -#[allow(unused)] -#[macro_export] -macro_rules! ignore { - ($expr:expr) => {{ - $expr - }}; -}