Skip to content

Commit 2bfff32

Browse files
KobzolKobzol
committed
Add some compiletest suites snapshot tests
1 parent 99583d1 commit 2bfff32

File tree

2 files changed

+133
-35
lines changed

2 files changed

+133
-35
lines changed

‎src/bootstrap/src/core/build_steps/test.rs‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1476,12 +1476,6 @@ macro_rules! test {
14761476
}),
14771477
})
14781478
}
1479-
1480-
fn metadata(&self) -> Option<StepMetadata> {
1481-
Some(
1482-
StepMetadata::test(stringify!($name), self.target)
1483-
)
1484-
}
14851479
}
14861480
};
14871481
}
@@ -2362,6 +2356,13 @@ HELP: You can add it into `bootstrap.toml` in `rust.codegen-backends = [{name:?}
23622356
try_run_tests(builder, &mut cmd, false);
23632357
}
23642358
}
2359+
2360+
fn metadata(&self) -> Option<StepMetadata> {
2361+
Some(
2362+
StepMetadata::test(&format!("compiletest-{}", self.suite), self.target)
2363+
.stage(self.compiler.stage),
2364+
)
2365+
}
23652366
}
23662367

23672368
/// Runs the documentation tests for a book in `src/doc` using the `rustdoc` of `test_compiler`.

‎src/bootstrap/src/core/builder/tests.rs‎

Lines changed: 126 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -2062,20 +2062,23 @@ mod snapshot {
20622062
[build] rustc 0 <host> -> rustc 1 <host>
20632063
[build] rustc 1 <host> -> std 1 <host>
20642064
[build] rustc 0 <host> -> Compiletest 1 <host>
2065-
[test] Ui <host>
2066-
[test] Crashes <host>
2065+
[test] compiletest-ui 1 <host>
2066+
[test] compiletest-crashes 1 <host>
20672067
[build] rustc 0 <host> -> CoverageDump 1 <host>
2068+
[test] compiletest-coverage 1 <host>
2069+
[test] compiletest-coverage 1 <host>
20682070
[build] rustc 1 <host> -> std 1 <host>
2069-
[test] CodegenLlvm <host>
2070-
[test] CodegenUnits <host>
2071-
[test] AssemblyLlvm <host>
2072-
[test] Incremental <host>
2073-
[test] Debuginfo <host>
2074-
[test] UiFullDeps <host>
2071+
[test] compiletest-mir-opt 1 <host>
2072+
[test] compiletest-codegen-llvm 1 <host>
2073+
[test] compiletest-codegen-units 1 <host>
2074+
[test] compiletest-assembly-llvm 1 <host>
2075+
[test] compiletest-incremental 1 <host>
2076+
[test] compiletest-debuginfo 1 <host>
2077+
[test] compiletest-ui-fulldeps 1 <host>
20752078
[build] rustdoc 1 <host>
2076-
[test] Rustdoc <host>
2077-
[test] CoverageRunRustdoc <host>
2078-
[test] Pretty <host>
2079+
[test] compiletest-rustdoc 1 <host>
2080+
[test] compiletest-coverage-run-rustdoc 1 <host>
2081+
[test] compiletest-pretty 1 <host>
20792082
[build] rustc 1 <host> -> std 1 <host>
20802083
[build] rustc 0 <host> -> std 0 <host>
20812084
[test] rustc 0 <host> -> CrateLibrustc 1 <host>
@@ -2113,16 +2116,107 @@ mod snapshot {
21132116
[test] rustc 0 <host> -> rust-analyzer 1 <host>
21142117
[build] rustc 0 <host> -> RustdocTheme 1 <host>
21152118
[test] rustdoc-theme 1 <host>
2116-
[test] RustdocUi <host>
2119+
[test] compiletest-rustdoc-ui 1 <host>
21172120
[build] rustc 0 <host> -> JsonDocCk 1 <host>
21182121
[build] rustc 0 <host> -> JsonDocLint 1 <host>
2119-
[test] RustdocJson <host>
2122+
[test] compiletest-rustdoc-json 1 <host>
21202123
[doc] rustc 0 <host> -> rustc 1 <host>
21212124
[build] rustc 0 <host> -> HtmlChecker 1 <host>
21222125
[test] html-check <host>
21232126
[build] rustc 0 <host> -> RunMakeSupport 1 <host>
21242127
[build] rustc 1 <host> -> cargo 2 <host>
2125-
[test] RunMake <host>
2128+
[test] compiletest-run-make 1 <host>
2129+
");
2130+
}
2131+
2132+
#[test]
2133+
fn test_compiletest_suites_stage1() {
2134+
let ctx = TestCtx::new();
2135+
insta::assert_snapshot!(
2136+
ctx.config("test")
2137+
.args(&["ui", "ui-fulldeps", "run-make", "rustdoc", "rustdoc-gui", "incremental"])
2138+
.render_steps(), @r"
2139+
[build] llvm <host>
2140+
[build] rustc 0 <host> -> rustc 1 <host>
2141+
[build] rustc 1 <host> -> std 1 <host>
2142+
[build] rustc 0 <host> -> Compiletest 1 <host>
2143+
[test] compiletest-ui 1 <host>
2144+
[test] compiletest-ui-fulldeps 1 <host>
2145+
[build] rustc 0 <host> -> RunMakeSupport 1 <host>
2146+
[build] rustc 1 <host> -> cargo 2 <host>
2147+
[build] rustdoc 1 <host>
2148+
[test] compiletest-run-make 1 <host>
2149+
[test] compiletest-rustdoc 1 <host>
2150+
[build] rustc 0 <host> -> RustdocGUITest 1 <host>
2151+
[test] rustdoc-gui 1 <host>
2152+
[test] compiletest-incremental 1 <host>
2153+
[build] rustc 1 <host> -> rustc 2 <host>
2154+
");
2155+
}
2156+
2157+
#[test]
2158+
fn test_compiletest_suites_stage2() {
2159+
let ctx = TestCtx::new();
2160+
insta::assert_snapshot!(
2161+
ctx.config("test")
2162+
.args(&["ui", "ui-fulldeps", "run-make", "rustdoc", "rustdoc-gui", "incremental"])
2163+
.stage(2)
2164+
.render_steps(), @r"
2165+
[build] llvm <host>
2166+
[build] rustc 0 <host> -> rustc 1 <host>
2167+
[build] rustc 1 <host> -> std 1 <host>
2168+
[build] rustc 1 <host> -> rustc 2 <host>
2169+
[build] rustc 2 <host> -> std 2 <host>
2170+
[build] rustc 0 <host> -> Compiletest 1 <host>
2171+
[test] compiletest-ui 2 <host>
2172+
[build] rustc 2 <host> -> rustc 3 <host>
2173+
[test] compiletest-ui-fulldeps 2 <host>
2174+
[build] rustc 0 <host> -> RunMakeSupport 1 <host>
2175+
[build] rustc 2 <host> -> cargo 3 <host>
2176+
[build] rustdoc 2 <host>
2177+
[test] compiletest-run-make 2 <host>
2178+
[test] compiletest-rustdoc 2 <host>
2179+
[build] rustc 0 <host> -> RustdocGUITest 1 <host>
2180+
[test] rustdoc-gui 2 <host>
2181+
[test] compiletest-incremental 2 <host>
2182+
[build] rustdoc 1 <host>
2183+
");
2184+
}
2185+
2186+
#[test]
2187+
fn test_compiletest_suites_stage2_cross() {
2188+
let ctx = TestCtx::new();
2189+
insta::assert_snapshot!(
2190+
ctx.config("test")
2191+
.hosts(&[TEST_TRIPLE_1])
2192+
.targets(&[TEST_TRIPLE_1])
2193+
.args(&["ui", "ui-fulldeps", "run-make", "rustdoc", "rustdoc-gui", "incremental"])
2194+
.stage(2)
2195+
.render_steps(), @r"
2196+
[build] llvm <host>
2197+
[build] rustc 0 <host> -> rustc 1 <host>
2198+
[build] rustc 1 <host> -> std 1 <host>
2199+
[build] rustc 1 <host> -> rustc 2 <host>
2200+
[build] rustc 2 <host> -> std 2 <host>
2201+
[build] rustc 0 <host> -> Compiletest 1 <host>
2202+
[build] rustc 1 <host> -> std 1 <target1>
2203+
[build] rustc 2 <host> -> std 2 <target1>
2204+
[test] compiletest-ui 2 <target1>
2205+
[build] llvm <target1>
2206+
[build] rustc 2 <host> -> rustc 3 <target1>
2207+
[test] compiletest-ui-fulldeps 2 <target1>
2208+
[build] rustc 0 <host> -> RunMakeSupport 1 <host>
2209+
[build] rustc 2 <host> -> cargo 3 <host>
2210+
[build] rustdoc 2 <host>
2211+
[test] compiletest-run-make 2 <target1>
2212+
[test] compiletest-rustdoc 2 <target1>
2213+
[build] rustc 0 <host> -> RustdocGUITest 1 <host>
2214+
[test] rustdoc-gui 2 <target1>
2215+
[test] compiletest-incremental 2 <target1>
2216+
[build] rustc 1 <host> -> rustc 2 <target1>
2217+
[build] rustdoc 1 <host>
2218+
[build] rustc 2 <target1> -> std 2 <target1>
2219+
[build] rustdoc 2 <target1>
21262220
");
21272221
}
21282222

@@ -2142,21 +2236,24 @@ mod snapshot {
21422236
[build] rustc 1 <host> -> rustc 2 <host>
21432237
[build] rustc 2 <host> -> std 2 <host>
21442238
[build] rustc 0 <host> -> Compiletest 1 <host>
2145-
[test] Ui <host>
2146-
[test] Crashes <host>
2239+
[test] compiletest-ui 2 <host>
2240+
[test] compiletest-crashes 2 <host>
21472241
[build] rustc 0 <host> -> CoverageDump 1 <host>
2242+
[test] compiletest-coverage 2 <host>
2243+
[test] compiletest-coverage 2 <host>
21482244
[build] rustc 2 <host> -> std 2 <host>
2149-
[test] CodegenLlvm <host>
2150-
[test] CodegenUnits <host>
2151-
[test] AssemblyLlvm <host>
2152-
[test] Incremental <host>
2153-
[test] Debuginfo <host>
2245+
[test] compiletest-mir-opt 2 <host>
2246+
[test] compiletest-codegen-llvm 2 <host>
2247+
[test] compiletest-codegen-units 2 <host>
2248+
[test] compiletest-assembly-llvm 2 <host>
2249+
[test] compiletest-incremental 2 <host>
2250+
[test] compiletest-debuginfo 2 <host>
21542251
[build] rustc 2 <host> -> rustc 3 <host>
2155-
[test] UiFullDeps <host>
2252+
[test] compiletest-ui-fulldeps 2 <host>
21562253
[build] rustdoc 2 <host>
2157-
[test] Rustdoc <host>
2158-
[test] CoverageRunRustdoc <host>
2159-
[test] Pretty <host>
2254+
[test] compiletest-rustdoc 2 <host>
2255+
[test] compiletest-coverage-run-rustdoc 2 <host>
2256+
[test] compiletest-pretty 2 <host>
21602257
[build] rustc 2 <host> -> std 2 <host>
21612258
[build] rustc 1 <host> -> std 1 <host>
21622259
[build] rustdoc 1 <host>
@@ -2196,16 +2293,16 @@ mod snapshot {
21962293
[test] rustc 1 <host> -> lint-docs 2 <host>
21972294
[build] rustc 0 <host> -> RustdocTheme 1 <host>
21982295
[test] rustdoc-theme 2 <host>
2199-
[test] RustdocUi <host>
2296+
[test] compiletest-rustdoc-ui 2 <host>
22002297
[build] rustc 0 <host> -> JsonDocCk 1 <host>
22012298
[build] rustc 0 <host> -> JsonDocLint 1 <host>
2202-
[test] RustdocJson <host>
2299+
[test] compiletest-rustdoc-json 2 <host>
22032300
[doc] rustc 1 <host> -> rustc 2 <host>
22042301
[build] rustc 0 <host> -> HtmlChecker 1 <host>
22052302
[test] html-check <host>
22062303
[build] rustc 0 <host> -> RunMakeSupport 1 <host>
22072304
[build] rustc 2 <host> -> cargo 3 <host>
2208-
[test] RunMake <host>
2305+
[test] compiletest-run-make 2 <host>
22092306
");
22102307
}
22112308

@@ -2249,7 +2346,7 @@ mod snapshot {
22492346
let steps = ctx.config("test").args(&["--skip", "src/tools/tidy"]).get_steps();
22502347

22512348
let host = TargetSelection::from_user(&host_target());
2252-
steps.assert_contains(StepMetadata::test("RustdocUi", host));
2349+
steps.assert_contains(StepMetadata::test("compiletest-rustdoc-ui", host).stage(1));
22532350
steps.assert_not_contains(test::Tidy);
22542351
}
22552352

0 commit comments

Comments
 (0)