Skip to content

Commit 2dc1a0a

Browse files
authored
Rollup merge of rust-lang#38665 - alexcrichton:pretty-only-host, r=brson
rustbuild: Move pretty test suites to host-only In an ongoing effort to optimize the runtime of the Android cross builder this commit updates the pretty test suites to run only for host platforms, not for target platforms as well. This means we'll still keep running all the suites but we'll only run them for configured hosts, not for configured targets. This notably means that we won't be running these suites on Android or musl targets, for example.
2 parents 2068e1c + fc3e49b commit 2dc1a0a

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

src/bootstrap/step.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -317,13 +317,6 @@ pub fn build_rules<'a>(build: &'a Build) -> Rules {
317317
suite("check-incremental", "src/test/incremental", "incremental",
318318
"incremental");
319319
suite("check-ui", "src/test/ui", "ui", "ui");
320-
suite("check-pretty", "src/test/pretty", "pretty", "pretty");
321-
suite("check-pretty-rpass", "src/test/run-pass/pretty", "pretty",
322-
"run-pass");
323-
suite("check-pretty-rfail", "src/test/run-pass/pretty", "pretty",
324-
"run-fail");
325-
suite("check-pretty-valgrind", "src/test/run-pass-valgrind", "pretty",
326-
"run-pass-valgrind");
327320
}
328321

329322
if build.config.build.contains("msvc") {
@@ -370,6 +363,13 @@ pub fn build_rules<'a>(build: &'a Build) -> Rules {
370363
"compile-fail", "compile-fail-fulldeps");
371364
suite("check-rmake", "src/test/run-make", "run-make", "run-make");
372365
suite("check-rustdoc", "src/test/rustdoc", "rustdoc", "rustdoc");
366+
suite("check-pretty", "src/test/pretty", "pretty", "pretty");
367+
suite("check-pretty-rpass", "src/test/run-pass/pretty", "pretty",
368+
"run-pass");
369+
suite("check-pretty-rfail", "src/test/run-pass/pretty", "pretty",
370+
"run-fail");
371+
suite("check-pretty-valgrind", "src/test/run-pass-valgrind", "pretty",
372+
"run-pass-valgrind");
373373
suite("check-pretty-rpass-full", "src/test/run-pass-fulldeps",
374374
"pretty", "run-pass-fulldeps");
375375
suite("check-pretty-rfail-full", "src/test/run-fail-fulldeps",

0 commit comments

Comments
 (0)