@@ -999,6 +999,7 @@ impl Step for RustdocGUI {
999
999
let run = run. suite_path ( "tests/rustdoc-gui" ) ;
1000
1000
run. lazy_default_condition ( Box :: new ( move || {
1001
1001
builder. config . nodejs . is_some ( )
1002
+ && builder. doc_tests != DocTests :: Only
1002
1003
&& builder
1003
1004
. config
1004
1005
. npm
@@ -1158,7 +1159,8 @@ HELP: to skip test's attempt to check tidiness, pass `--skip src/tools/tidy` to
1158
1159
}
1159
1160
1160
1161
fn should_run ( run : ShouldRun < ' _ > ) -> ShouldRun < ' _ > {
1161
- run. path ( "src/tools/tidy" )
1162
+ let default = run. builder . doc_tests != DocTests :: Only ;
1163
+ run. path ( "src/tools/tidy" ) . default_condition ( default)
1162
1164
}
1163
1165
1164
1166
fn make_run ( run : RunConfig < ' _ > ) {
@@ -1560,6 +1562,10 @@ impl Step for Compiletest {
1560
1562
/// compiletest `mode` and `suite` arguments. For example `mode` can be
1561
1563
/// "run-pass" or `suite` can be something like `debuginfo`.
1562
1564
fn run ( self , builder : & Builder < ' _ > ) {
1565
+ if builder. doc_tests == DocTests :: Only {
1566
+ return ;
1567
+ }
1568
+
1563
1569
if builder. top_stage == 0 && env:: var ( "COMPILETEST_FORCE_STAGE0" ) . is_err ( ) {
1564
1570
eprintln ! ( "\
1565
1571
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 {
2323
2329
}
2324
2330
2325
2331
fn run ( self , builder : & Builder < ' _ > ) {
2332
+ builder. ensure ( compile:: Std :: new ( self . compiler , self . target ) ) ;
2333
+
2326
2334
builder. ensure ( Crate {
2327
2335
compiler : self . compiler ,
2328
2336
target : self . target ,
0 commit comments