@@ -2037,19 +2037,23 @@ mod snapshot {
20372037 . render_steps( ) , @"[check] rustc 0 <host> -> RunMakeSupport 1 <host>" ) ;
20382038 }
20392039
2040+ fn prepare_test_config ( ctx : & TestCtx ) -> ConfigBuilder {
2041+ ctx. config ( "test" )
2042+ // Bootstrap only runs by default on CI, so we have to emulate that also locally.
2043+ . args ( & [ "--ci" , "true" ] )
2044+ // These rustdoc tests requires nodejs to be present.
2045+ // We can't easily opt out of it, so if it is present on the local PC, the test
2046+ // would have different result on CI, where nodejs might be missing.
2047+ . args ( & [ "--skip" , "rustdoc-js-std" ] )
2048+ . args ( & [ "--skip" , "rustdoc-js" ] )
2049+ . args ( & [ "--skip" , "rustdoc-gui" ] )
2050+ }
2051+
20402052 #[ test]
2041- fn test_all ( ) {
2053+ fn test_all_stage_1 ( ) {
20422054 let ctx = TestCtx :: new ( ) ;
20432055 insta:: assert_snapshot!(
2044- ctx. config( "test" )
2045- // Bootstrap only run by default on CI, so we have to emulate that also locally.
2046- . args( & [ "--ci" , "true" ] )
2047- // These rustdoc tests requires nodejs to be present.
2048- // We can't easily opt out of it, so if it is present on the local PC, the test
2049- // would have different result on CI, where nodejs might be missing.
2050- . args( & [ "--skip" , "rustdoc-js-std" ] )
2051- . args( & [ "--skip" , "rustdoc-js" ] )
2052- . args( & [ "--skip" , "rustdoc-gui" ] )
2056+ prepare_test_config( & ctx)
20532057 . render_steps( ) , @r"
20542058 [build] rustc 0 <host> -> Tidy 1 <host>
20552059 [test] tidy <>
@@ -2124,6 +2128,89 @@ mod snapshot {
21242128 " ) ;
21252129 }
21262130
2131+ #[ test]
2132+ fn test_all_stage_2 ( ) {
2133+ let ctx = TestCtx :: new ( ) ;
2134+ insta:: assert_snapshot!(
2135+ prepare_test_config( & ctx)
2136+ . stage( 2 )
2137+ . render_steps( ) , @r"
2138+ [build] rustc 0 <host> -> Tidy 1 <host>
2139+ [test] tidy <>
2140+ [build] rustdoc 0 <host>
2141+ [build] llvm <host>
2142+ [build] rustc 0 <host> -> rustc 1 <host>
2143+ [build] rustc 1 <host> -> std 1 <host>
2144+ [build] rustc 1 <host> -> rustc 2 <host>
2145+ [build] rustc 2 <host> -> std 2 <host>
2146+ [build] rustc 0 <host> -> Compiletest 1 <host>
2147+ [test] Ui <host>
2148+ [test] Crashes <host>
2149+ [build] rustc 0 <host> -> CoverageDump 1 <host>
2150+ [build] rustc 2 <host> -> std 2 <host>
2151+ [test] CodegenLlvm <host>
2152+ [test] CodegenUnits <host>
2153+ [test] AssemblyLlvm <host>
2154+ [test] Incremental <host>
2155+ [test] Debuginfo <host>
2156+ [build] rustc 2 <host> -> rustc 3 <host>
2157+ [test] UiFullDeps <host>
2158+ [build] rustdoc 2 <host>
2159+ [test] Rustdoc <host>
2160+ [test] CoverageRunRustdoc <host>
2161+ [test] Pretty <host>
2162+ [build] rustc 2 <host> -> std 2 <host>
2163+ [build] rustc 1 <host> -> std 1 <host>
2164+ [build] rustdoc 1 <host>
2165+ [test] rustc 1 <host> -> CrateLibrustc 2 <host>
2166+ [test] crate-bootstrap <host> src/tools/coverage-dump
2167+ [test] crate-bootstrap <host> src/tools/jsondoclint
2168+ [test] crate-bootstrap <host> src/tools/replace-version-placeholder
2169+ [test] crate-bootstrap <host> tidyselftest
2170+ [build] rustc 0 <host> -> UnstableBookGen 1 <host>
2171+ [build] rustc 0 <host> -> Rustbook 1 <host>
2172+ [doc] unstable-book (book) <host>
2173+ [doc] book (book) <host>
2174+ [doc] book/first-edition (book) <host>
2175+ [doc] book/second-edition (book) <host>
2176+ [doc] book/2018-edition (book) <host>
2177+ [doc] rustc 1 <host> -> standalone 2 <host>
2178+ [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]
2179+ [build] rustc 1 <host> -> error-index 2 <host>
2180+ [doc] rustc 1 <host> -> error-index 2 <host>
2181+ [doc] nomicon (book) <host>
2182+ [doc] rustc 1 <host> -> reference (book) 2 <host>
2183+ [doc] rustdoc (book) <host>
2184+ [doc] rust-by-example (book) <host>
2185+ [build] rustc 0 <host> -> LintDocs 1 <host>
2186+ [doc] rustc (book) <host>
2187+ [doc] cargo (book) <host>
2188+ [doc] clippy (book) <host>
2189+ [doc] embedded-book (book) <host>
2190+ [doc] edition-guide (book) <host>
2191+ [doc] style-guide (book) <host>
2192+ [doc] rustc 1 <host> -> releases 2 <host>
2193+ [build] rustc 0 <host> -> Linkchecker 1 <host>
2194+ [test] link-check <host>
2195+ [test] tier-check <host>
2196+ [test] rustc 1 <host> -> rust-analyzer 2 <host>
2197+ [doc] rustc (book) <host>
2198+ [test] rustc 1 <host> -> lint-docs 2 <host>
2199+ [build] rustc 0 <host> -> RustdocTheme 1 <host>
2200+ [test] rustdoc-theme 2 <host>
2201+ [test] RustdocUi <host>
2202+ [build] rustc 0 <host> -> JsonDocCk 1 <host>
2203+ [build] rustc 0 <host> -> JsonDocLint 1 <host>
2204+ [test] RustdocJson <host>
2205+ [doc] rustc 1 <host> -> rustc 2 <host>
2206+ [build] rustc 0 <host> -> HtmlChecker 1 <host>
2207+ [test] html-check <host>
2208+ [build] rustc 0 <host> -> RunMakeSupport 1 <host>
2209+ [build] rustc 2 <host> -> cargo 3 <host>
2210+ [test] RunMake <host>
2211+ " ) ;
2212+ }
2213+
21272214 #[ test]
21282215 fn test_exclude ( ) {
21292216 let ctx = TestCtx :: new ( ) ;
0 commit comments