dnrops
/
rust
mirror of https://github.com/rust-lang/rust.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rollup merge of #118322 - onur-ozkan:if-only-doctests-skip-compiletest, r=clubby789 

skip {tidy,compiletest,rustdoc-gui} based tests for `DocTests::Only`

As use of `--doc` with `x test` is intended for running doc-tests only, executing compiletest, tidy or rustdoc-gui based tests considered as an incorrect behavior from bootstrap. This change fixes that.
This commit is contained in:
Matthias Krüger 2023-11-27 08:21:18 +01:00 committed by GitHub
parent 601a42713c 1a86482c57
commit 8946bf56c6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/bootstrap/src/core/build_steps/test.rs
View File

@ -999,6 +999,7 @@ impl Step for RustdocGUI {
let run = run.suite_path("tests/rustdoc-gui"); let run = run.suite_path("tests/rustdoc-gui");
run.lazy_default_condition(Box::new(move || { run.lazy_default_condition(Box::new(move || {
builder.config.nodejs.is_some() builder.config.nodejs.is_some()
&& builder.doc_tests != DocTests::Only
&& builder && builder
.config .config
.npm .npm
@ -1158,7 +1159,8 @@ HELP: to skip test's attempt to check tidiness, pass `--skip src/tools/tidy` to
} }
fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> { fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
run.path("src/tools/tidy") let default = run.builder.doc_tests != DocTests::Only;
run.path("src/tools/tidy").default_condition(default)
} }
fn make_run(run: RunConfig<'_>) { fn make_run(run: RunConfig<'_>) {
@ -1560,6 +1562,10 @@ impl Step for Compiletest {
/// compiletest `mode` and `suite` arguments. For example `mode` can be /// compiletest `mode` and `suite` arguments. For example `mode` can be
/// "run-pass" or `suite` can be something like `debuginfo`. /// "run-pass" or `suite` can be something like `debuginfo`.
fn run(self, builder: &Builder<'_>) { fn run(self, builder: &Builder<'_>) {
if builder.doc_tests == DocTests::Only {
return;
}
if builder.top_stage == 0 && env::var("COMPILETEST_FORCE_STAGE0").is_err() { if builder.top_stage == 0 && env::var("COMPILETEST_FORCE_STAGE0").is_err() {
eprintln!("\ eprintln!("\
ERROR: `--stage 0` runs compiletest on the beta compiler, not your local changes, and will almost always cause tests to fail ERROR: `--stage 0` runs compiletest on the beta compiler, not your local changes, and will almost always cause tests to fail
@ -2323,6 +2329,8 @@ impl Step for CrateLibrustc {
} }
fn run(self, builder: &Builder<'_>) { fn run(self, builder: &Builder<'_>) {
builder.ensure(compile::Std::new(self.compiler, self.target));
builder.ensure(Crate { builder.ensure(Crate {
compiler: self.compiler, compiler: self.compiler,
target: self.target, target: self.target,