File tree Expand file tree Collapse file tree 2 files changed +9
-7
lines changed Expand file tree Collapse file tree 2 files changed +9
-7
lines changed Original file line number Diff line number Diff line change @@ -1856,12 +1856,14 @@ mod snapshot {
18561856 let ctx = TestCtx :: new ( ) ;
18571857 insta:: assert_snapshot!(
18581858 ctx. config( "test" )
1859- // Skip bootstrap tests, as for some reason the recursive nature of running
1860- // bootstrap tests under bootstrap tests causes non-deterministic snapshot diffs
1861- // on CI.
1862- . args( & [ "--skip" , "bootstrap" ] )
1863- // rustdoc-js-std requires nodejs to be present
1864- . args( & [ "--set" , "build.nodejs=/bin/nodejs" ] )
1859+ // Bootstrap only run by default on CI, so we have to emulate that also locally.
1860+ . args( & [ "--ci" , "true" ] )
1861+ // These rustdoc tests requires nodejs to be present.
1862+ // We can't easily opt out of it, so if it is present on the local PC, the test
1863+ // would have different result on CI, where nodejs might be missing.
1864+ . args( & [ "--skip" , "rustdoc-js-std" ] )
1865+ . args( & [ "--skip" , "rustdoc-js" ] )
1866+ . args( & [ "--skip" , "rustdoc-gui" ] )
18651867 . render_steps( ) , @r"
18661868 [build] rustc 0 <host> -> Tidy 1 <host>
18671869 [test] tidy <>
Original file line number Diff line number Diff line change @@ -1151,7 +1151,7 @@ impl Build {
11511151
11521152 /// Return a `Group` guard for a [`Step`] that tests `what` with the given `stage` and `target`
11531153 /// (determined by `host_and_stage`).
1154- /// Use this instead of [`builder::Builder ::msg`] when there is no clear `build_compiler` to be
1154+ /// Use this instead of [`Build ::msg`] when there is no clear `build_compiler` to be
11551155 /// determined.
11561156 ///
11571157 /// [`Step`]: crate::core::builder::Step
You can’t perform that action at this time.
0 commit comments