Skip to content

Commit

Permalink
Auto merge of #132979 - onur-ozkan:skip-exact, r=<try>
Browse files Browse the repository at this point in the history
use `--exact` on `--skip` to avoid unintended substring matches

Without the `--exact` flag, using `--skip tests/rustdoc` can unintentionally skip other tests that match as substrings such as `rustdoc-gui`, `rustdoc-js`, etc.

For debugging, run: `./x.py --stage 2 test rustdoc-ui --skip tests/rustdoc` and `./x.py --stage 2 test rustdoc-ui --skip tests/rustdoc -- --exact`

Resolves #117721

try-job: x86_64-apple-1
  • Loading branch information
bors committed Nov 13, 2024
2 parents a00df61 + 11dca9e commit 505cd65
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 8 deletions.
10 changes: 3 additions & 7 deletions src/bootstrap/src/core/build_steps/test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3405,7 +3405,6 @@ impl Step for CodegenCranelift {
// FIXME remove once vendoring is handled
.arg("--skip-test")
.arg("testsuite.extended_sysroot");
cargo.args(builder.config.test_args());

cargo.into_cmd().run(builder);
}
Expand Down Expand Up @@ -3600,13 +3599,10 @@ impl Step for TestFloatParse {
&[],
);

cargo_run.arg("--");
if builder.config.args().is_empty() {
cargo_run
.arg("--")
// By default, exclude tests that take longer than ~1m.
cargo_run.arg("--skip-huge");
} else {
cargo_run.args(builder.config.args());
}
.arg("--skip-huge");

cargo_run.into_cmd().run(builder);
}
Expand Down
2 changes: 1 addition & 1 deletion src/ci/github-actions/jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ runners:

envs:
env-x86_64-apple-tests: &env-x86_64-apple-tests
SCRIPT: ./x.py --stage 2 test --skip tests/ui --skip tests/rustdoc
SCRIPT: ./x.py --stage 2 test --skip tests/ui --skip tests/rustdoc -- --exact
RUST_CONFIGURE_ARGS: --build=x86_64-apple-darwin --enable-sanitizers --enable-profiler --set rust.jemalloc
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
MACOSX_DEPLOYMENT_TARGET: 10.12
Expand Down

0 comments on commit 505cd65

Please sign in to comment.