Skip to content

Commit dbf19c3

Browse files
committed
rustbuild: remove obsolete fulldeps behavior from src/test/pretty tests, and enable them by default.
1 parent 0ee059d commit dbf19c3

File tree

2 files changed

+3
-10
lines changed

2 files changed

+3
-10
lines changed

src/bootstrap/mk/Makefile.in

-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ check:
4848
$(Q)$(BOOTSTRAP) test $(BOOTSTRAP_ARGS)
4949
check-aux:
5050
$(Q)$(BOOTSTRAP) test \
51-
src/test/pretty \
5251
src/test/run-pass/pretty \
5352
src/test/run-fail/pretty \
5453
src/test/run-pass-valgrind/pretty \

src/bootstrap/test.rs

+3-9
Original file line numberDiff line numberDiff line change
@@ -897,12 +897,10 @@ host_test!(Rustdoc {
897897
suite: "rustdoc"
898898
});
899899

900-
test!(Pretty {
900+
host_test!(Pretty {
901901
path: "src/test/pretty",
902902
mode: "pretty",
903-
suite: "pretty",
904-
default: false,
905-
host: true
903+
suite: "pretty"
906904
});
907905
test!(RunPassPretty {
908906
path: "src/test/run-pass/pretty",
@@ -993,11 +991,7 @@ impl Step for Compiletest {
993991
});
994992
}
995993

996-
if suite.ends_with("fulldeps") ||
997-
// FIXME: Does pretty need librustc compiled? Note that there are
998-
// fulldeps test suites with mode = pretty as well.
999-
mode == "pretty"
1000-
{
994+
if suite.ends_with("fulldeps") {
1001995
builder.ensure(compile::Rustc { compiler, target });
1002996
}
1003997

0 commit comments

Comments
 (0)