@@ -1990,19 +1990,23 @@ mod snapshot {
19901990 . render_steps( ) , @"[check] rustc 0 <host> -> RunMakeSupport 1 <host>" ) ;
19911991 }
19921992
1993+ fn prepare_test_config ( ctx : & TestCtx ) -> ConfigBuilder {
1994+ ctx. config ( "test" )
1995+ // Bootstrap only runs by default on CI, so we have to emulate that also locally.
1996+ . args ( & [ "--ci" , "true" ] )
1997+ // These rustdoc tests requires nodejs to be present.
1998+ // We can't easily opt out of it, so if it is present on the local PC, the test
1999+ // would have different result on CI, where nodejs might be missing.
2000+ . args ( & [ "--skip" , "rustdoc-js-std" ] )
2001+ . args ( & [ "--skip" , "rustdoc-js" ] )
2002+ . args ( & [ "--skip" , "rustdoc-gui" ] )
2003+ }
2004+
19932005 #[ test]
1994- fn test_all ( ) {
2006+ fn test_all_stage_1 ( ) {
19952007 let ctx = TestCtx :: new ( ) ;
19962008 insta:: assert_snapshot!(
1997- ctx. config( "test" )
1998- // Bootstrap only run by default on CI, so we have to emulate that also locally.
1999- . args( & [ "--ci" , "true" ] )
2000- // These rustdoc tests requires nodejs to be present.
2001- // We can't easily opt out of it, so if it is present on the local PC, the test
2002- // would have different result on CI, where nodejs might be missing.
2003- . args( & [ "--skip" , "rustdoc-js-std" ] )
2004- . args( & [ "--skip" , "rustdoc-js" ] )
2005- . args( & [ "--skip" , "rustdoc-gui" ] )
2009+ prepare_test_config( & ctx)
20062010 . render_steps( ) , @r"
20072011 [build] rustc 0 <host> -> Tidy 1 <host>
20082012 [test] tidy <>
@@ -2077,6 +2081,89 @@ mod snapshot {
20772081 " ) ;
20782082 }
20792083
2084+ #[ test]
2085+ fn test_all_stage_2 ( ) {
2086+ let ctx = TestCtx :: new ( ) ;
2087+ insta:: assert_snapshot!(
2088+ prepare_test_config( & ctx)
2089+ . stage( 2 )
2090+ . render_steps( ) , @r"
2091+ [build] rustc 0 <host> -> Tidy 1 <host>
2092+ [test] tidy <>
2093+ [build] rustdoc 0 <host>
2094+ [build] llvm <host>
2095+ [build] rustc 0 <host> -> rustc 1 <host>
2096+ [build] rustc 1 <host> -> std 1 <host>
2097+ [build] rustc 1 <host> -> rustc 2 <host>
2098+ [build] rustc 2 <host> -> std 2 <host>
2099+ [build] rustc 0 <host> -> Compiletest 1 <host>
2100+ [test] Ui <host>
2101+ [test] Crashes <host>
2102+ [build] rustc 0 <host> -> CoverageDump 1 <host>
2103+ [build] rustc 2 <host> -> std 2 <host>
2104+ [test] CodegenLlvm <host>
2105+ [test] CodegenUnits <host>
2106+ [test] AssemblyLlvm <host>
2107+ [test] Incremental <host>
2108+ [test] Debuginfo <host>
2109+ [build] rustc 2 <host> -> rustc 3 <host>
2110+ [test] UiFullDeps <host>
2111+ [build] rustdoc 2 <host>
2112+ [test] Rustdoc <host>
2113+ [test] CoverageRunRustdoc <host>
2114+ [test] Pretty <host>
2115+ [build] rustc 2 <host> -> std 2 <host>
2116+ [build] rustc 1 <host> -> std 1 <host>
2117+ [build] rustdoc 1 <host>
2118+ [test] rustc 1 <host> -> CrateLibrustc 2 <host>
2119+ [test] crate-bootstrap <host> src/tools/coverage-dump
2120+ [test] crate-bootstrap <host> src/tools/jsondoclint
2121+ [test] crate-bootstrap <host> src/tools/replace-version-placeholder
2122+ [test] crate-bootstrap <host> tidyselftest
2123+ [build] rustc 0 <host> -> UnstableBookGen 1 <host>
2124+ [build] rustc 0 <host> -> Rustbook 1 <host>
2125+ [doc] unstable-book (book) <host>
2126+ [doc] book (book) <host>
2127+ [doc] book/first-edition (book) <host>
2128+ [doc] book/second-edition (book) <host>
2129+ [doc] book/2018-edition (book) <host>
2130+ [doc] rustc 1 <host> -> standalone 2 <host>
2131+ [doc] rustc 2 <host> -> std 2 <host> crates=[alloc,compiler_builtins,core,panic_abort,panic_unwind,proc_macro,rustc-std-workspace-core,std,std_detect,sysroot,test,unwind]
2132+ [build] rustc 1 <host> -> error-index 2 <host>
2133+ [doc] rustc 1 <host> -> error-index 2 <host>
2134+ [doc] nomicon (book) <host>
2135+ [doc] rustc 1 <host> -> reference (book) 2 <host>
2136+ [doc] rustdoc (book) <host>
2137+ [doc] rust-by-example (book) <host>
2138+ [build] rustc 0 <host> -> LintDocs 1 <host>
2139+ [doc] rustc (book) <host>
2140+ [doc] cargo (book) <host>
2141+ [doc] clippy (book) <host>
2142+ [doc] embedded-book (book) <host>
2143+ [doc] edition-guide (book) <host>
2144+ [doc] style-guide (book) <host>
2145+ [doc] rustc 1 <host> -> releases 2 <host>
2146+ [build] rustc 0 <host> -> Linkchecker 1 <host>
2147+ [test] link-check <host>
2148+ [test] tier-check <host>
2149+ [test] rustc 1 <host> -> rust-analyzer 2 <host>
2150+ [doc] rustc (book) <host>
2151+ [test] rustc 1 <host> -> lint-docs 2 <host>
2152+ [build] rustc 0 <host> -> RustdocTheme 1 <host>
2153+ [test] rustdoc-theme 2 <host>
2154+ [test] RustdocUi <host>
2155+ [build] rustc 0 <host> -> JsonDocCk 1 <host>
2156+ [build] rustc 0 <host> -> JsonDocLint 1 <host>
2157+ [test] RustdocJson <host>
2158+ [doc] rustc 1 <host> -> rustc 2 <host>
2159+ [build] rustc 0 <host> -> HtmlChecker 1 <host>
2160+ [test] html-check <host>
2161+ [build] rustc 0 <host> -> RunMakeSupport 1 <host>
2162+ [build] rustc 2 <host> -> cargo 3 <host>
2163+ [test] RunMake <host>
2164+ " ) ;
2165+ }
2166+
20802167 #[ test]
20812168 fn test_exclude ( ) {
20822169 let ctx = TestCtx :: new ( ) ;
0 commit comments