about summary refs log tree commit diff
path: root/src/bootstrap/mk
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2016-12-29 09:55:16 -0800
committerAlex Crichton <alex@alexcrichton.com>2016-12-29 09:55:16 -0800
commit900dd8a7b9ca6d2786e9db8a2f5dcdff56b4ad2d (patch)
tree739fe3a04c874c727952fdba4f16357c6cee6eec /src/bootstrap/mk
parent3f957ebeff8932637002574c9eae75a702b202b7 (diff)
downloadrust-900dd8a7b9ca6d2786e9db8a2f5dcdff56b4ad2d.tar.gz
rust-900dd8a7b9ca6d2786e9db8a2f5dcdff56b4ad2d.zip
rustbuild: Don't run pretty tests by default
This commit relegates all pretty tests to not get run by default and rather get
run as part of an "aux" test suite. This "aux" suite is renamed from the old
"cargotest" suite to just collect tests that don't need to run everywhere but
should at least pass on Unix/Windows.
Diffstat (limited to 'src/bootstrap/mk')
-rw-r--r--src/bootstrap/mk/Makefile.in12
1 files changed, 10 insertions, 2 deletions
diff --git a/src/bootstrap/mk/Makefile.in b/src/bootstrap/mk/Makefile.in
index 0d83a79cf32..a3333369930 100644
--- a/src/bootstrap/mk/Makefile.in
+++ b/src/bootstrap/mk/Makefile.in
@@ -51,8 +51,16 @@ standalone-docs:
 	$(Q)$(BOOTSTRAP) doc src/doc $(BOOTSTRAP_ARGS)
 check:
 	$(Q)$(BOOTSTRAP) test $(BOOTSTRAP_ARGS)
-check-cargotest:
-	$(Q)$(BOOTSTRAP) test src/tools/cargotest $(BOOTSTRAP_ARGS)
+check-aux:
+	$(Q)$(BOOTSTRAP) test \
+		src/tools/cargotest \
+		src/test/pretty \
+		src/test/run-pass/pretty \
+		src/test/run-fail/pretty \
+		src/test/run-pass-valgrind/pretty \
+		src/test/run-pass-fulldeps/pretty \
+		src/test/run-fail-fulldeps/pretty \
+		$(BOOTSTRAP_ARGS)
 dist:
 	$(Q)$(BOOTSTRAP) dist $(BOOTSTRAP_ARGS)
 distcheck: