Merge branch 'aux-tests' of https://github.com/alexcrichton/rust into…

… rollup
rust-lang · 3eb459ff5ff845cce0695e3eee3206303f72338b · alexcrichton committed Dec 30, 2016 · Dec 30, 2016 · 3eb459f
2 parents ebea2ea + 900dd8a
commit 3eb459ff5ff845cce0695e3eee3206303f72338b
Unified Split

Showing with 23 additions and 15 deletions.

+1 −1 .travis.yml

+1 −1 appveyor.yml

+10 −2 src/bootstrap/mk/Makefile.in

+10 −10 src/bootstrap/step.rs

+1 −1 src/ci/docker/{x86_64-gnu-cargotest → x86_64-gnu-aux}/Dockerfile
diff --git a/.travis.yml b/.travis.yml
@@ -20,7 +20,7 @@ matrix:
     - env: IMAGE=x86_64-freebsd
     - env: IMAGE=x86_64-gnu
     - env: IMAGE=x86_64-gnu-full-bootstrap
-    - env: IMAGE=x86_64-gnu-cargotest
+    - env: IMAGE=x86_64-gnu-aux
     - env: IMAGE=x86_64-gnu-debug
     - env: IMAGE=x86_64-gnu-nopt
     - env: IMAGE=x86_64-gnu-make
diff --git a/appveyor.yml b/appveyor.yml
@@ -21,7 +21,7 @@ environment:
   # MSVC cargotest
   - MSYS_BITS: 64
     NO_VENDOR: 1
-    RUST_CHECK_TARGET: check-cargotest
+    RUST_CHECK_TARGET: check-aux
     RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc
 
   # 32/64-bit MinGW builds.
diff --git 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:
diff --git a/src/bootstrap/step.rs b/src/bootstrap/step.rs
@@ -284,7 +284,7 @@ pub fn build_rules<'a>(build: &'a Build) -> Rules {
     //
     // Various unit tests and tests suites we can run
     {
-        let mut suite = |name, path, dir, mode| {
+        let mut suite = |name, path, mode, dir| {
             rules.test(name, path)
                  .dep(|s| s.name("libtest"))
                  .dep(|s| s.name("tool-compiletest").target(s.host))
@@ -296,9 +296,9 @@ pub fn build_rules<'a>(build: &'a Build) -> Rules {
                          Step::noop()
                      }
                  })
-                 .default(true)
+                 .default(mode != "pretty") // pretty tests don't run everywhere
                  .run(move |s| {
-                     check::compiletest(build, &s.compiler(), s.target, dir, mode)
+                     check::compiletest(build, &s.compiler(), s.target, mode, dir)
                  });
         };
 
@@ -346,14 +346,14 @@ pub fn build_rules<'a>(build: &'a Build) -> Rules {
                                          s.target));
 
     {
-        let mut suite = |name, path, dir, mode| {
+        let mut suite = |name, path, mode, dir| {
             rules.test(name, path)
                  .dep(|s| s.name("librustc"))
                  .dep(|s| s.name("tool-compiletest").target(s.host))
-                 .default(true)
+                 .default(mode != "pretty")
                  .host(true)
                  .run(move |s| {
-                     check::compiletest(build, &s.compiler(), s.target, dir, mode)
+                     check::compiletest(build, &s.compiler(), s.target, mode, dir)
                  });
         };
 
@@ -366,13 +366,13 @@ pub fn build_rules<'a>(build: &'a Build) -> Rules {
         suite("check-pretty", "src/test/pretty", "pretty", "pretty");
         suite("check-pretty-rpass", "src/test/run-pass/pretty", "pretty",
               "run-pass");
-        suite("check-pretty-rfail", "src/test/run-pass/pretty", "pretty",
+        suite("check-pretty-rfail", "src/test/run-fail/pretty", "pretty",
               "run-fail");
-        suite("check-pretty-valgrind", "src/test/run-pass-valgrind", "pretty",
+        suite("check-pretty-valgrind", "src/test/run-pass-valgrind/pretty", "pretty",
               "run-pass-valgrind");
-        suite("check-pretty-rpass-full", "src/test/run-pass-fulldeps",
+        suite("check-pretty-rpass-full", "src/test/run-pass-fulldeps/pretty",
               "pretty", "run-pass-fulldeps");
-        suite("check-pretty-rfail-full", "src/test/run-fail-fulldeps",
+        suite("check-pretty-rfail-full", "src/test/run-fail-fulldeps/pretty",
               "pretty", "run-fail-fulldeps");
     }
 
diff --git a/...ci/docker/x86_64-gnu-cargotest/Dockerfile → src/ci/docker/x86_64-gnu-aux/Dockerfile b/...ci/docker/x86_64-gnu-cargotest/Dockerfile → src/ci/docker/x86_64-gnu-aux/Dockerfile
@@ -24,5 +24,5 @@ RUN curl -OL https://github.com/Yelp/dumb-init/releases/download/v1.2.0/dumb-ini
 ENTRYPOINT ["/usr/bin/dumb-init", "--"]
 
 ENV RUST_CONFIGURE_ARGS --build=x86_64-unknown-linux-gnu
-ENV RUST_CHECK_TARGET check-cargotest
+ENV RUST_CHECK_TARGET check-aux
 ENV NO_VENDOR 1