Skip to content

Commit ee2d862

Browse files
authoredNov 27, 2024
Rollup merge of #132979 - onur-ozkan:skip-exact, r=jieyouxu,tgross35
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
2 parents 48696f5 + 8d404a4 commit ee2d862

File tree

2 files changed

+3
-8
lines changed

2 files changed

+3
-8
lines changed
 

‎src/bootstrap/src/core/build_steps/test.rs

+2-7
Original file line numberDiff line numberDiff line change
@@ -3469,7 +3469,6 @@ impl Step for CodegenCranelift {
34693469
// FIXME remove once vendoring is handled
34703470
.arg("--skip-test")
34713471
.arg("testsuite.extended_sysroot");
3472-
cargo.args(builder.config.test_args());
34733472

34743473
cargo.into_cmd().run(builder);
34753474
}
@@ -3664,12 +3663,8 @@ impl Step for TestFloatParse {
36643663
&[],
36653664
);
36663665

3667-
cargo_run.arg("--");
3668-
if builder.config.args().is_empty() {
3669-
// By default, exclude tests that take longer than ~1m.
3670-
cargo_run.arg("--skip-huge");
3671-
} else {
3672-
cargo_run.args(builder.config.args());
3666+
if !matches!(env::var("FLOAT_PARSE_TESTS_NO_SKIP_HUGE").as_deref(), Ok("1") | Ok("true")) {
3667+
cargo_run.args(["--", "--skip-huge"]);
36733668
}
36743669

36753670
cargo_run.into_cmd().run(builder);

‎src/ci/github-actions/jobs.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ runners:
4848

4949
envs:
5050
env-x86_64-apple-tests: &env-x86_64-apple-tests
51-
SCRIPT: ./x.py --stage 2 test --skip tests/ui --skip tests/rustdoc
51+
SCRIPT: ./x.py --stage 2 test --skip tests/ui --skip tests/rustdoc -- --exact
5252
RUST_CONFIGURE_ARGS: --build=x86_64-apple-darwin --enable-sanitizers --enable-profiler --set rust.jemalloc
5353
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
5454
MACOSX_DEPLOYMENT_TARGET: 10.12

0 commit comments

Comments
 (0)
Please sign in to comment.