Skip to content

Commit 8675613

Browse files
committed
Auto merge of rust-lang#132979 - onur-ozkan:skip-exact, r=<try>
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 rust-lang#117721 try-job: x86_64-apple-1
2 parents 65b3877 + 1824c7f commit 8675613

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

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

-1
Original file line numberDiff line numberDiff line change
@@ -3405,7 +3405,6 @@ impl Step for CodegenCranelift {
34053405
// FIXME remove once vendoring is handled
34063406
.arg("--skip-test")
34073407
.arg("testsuite.extended_sysroot");
3408-
cargo.args(builder.config.test_args());
34093408

34103409
cargo.into_cmd().run(builder);
34113410
}

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)