bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #132979 - onur-ozkan:skip-exact, r=jieyouxu,tgross35

Browse source 
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 https://github.com/rust-lang/rust/issues/117721

try-job: x86_64-apple-1
This commit is contained in:
Matthias Krüger 2024-11-27 08:13:46 +01:00 • committed by GitHub
commit ee2d862212
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 3 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/bootstrap/src/core/build_steps/test.rs
View file

@ -3469,7 +3469,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);
}
@ -3664,12 +3663,8 @@ impl Step for TestFloatParse {
&[],
);
cargo_run.arg("--");
if builder.config.args().is_empty() {
// By default, exclude tests that take longer than ~1m.
cargo_run.arg("--skip-huge");
} else {
cargo_run.args(builder.config.args());
if !matches!(env::var("FLOAT_PARSE_TESTS_NO_SKIP_HUGE").as_deref(), Ok("1") | Ok("true")) {
cargo_run.args(["--", "--skip-huge"]);
}
cargo_run.into_cmd().run(builder);

2
src/ci/github-actions/jobs.yml
View file

@ -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