From f4f18586e755f239b5be3a60a6e3bfd382524210 Mon Sep 17 00:00:00 2001
From: Simon Sapin <simon.sapin@exyr.org>
Date: Fri, 15 Sep 2017 20:31:48 +0200
Subject: [PATCH] Move cargotest to separate jobs on Travis-CI and AppVeyor

---
 .travis.yml                                   |  2 ++
 appveyor.yml                                  |  5 +++++
 src/bootstrap/mk/Makefile.in                  |  1 -
 src/ci/docker/x86_64-gnu-cargotest/Dockerfile | 21 +++++++++++++++++++
 4 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 src/ci/docker/x86_64-gnu-cargotest/Dockerfile

diff --git a/.travis.yml b/.travis.yml
index c76e17a27d188..db34f1404481b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -169,6 +169,8 @@ matrix:
       if: branch = auto
     - env: IMAGE=x86_64-gnu-aux
       if: branch = auto
+    - env: IMAGE=x86_64-gnu-cargotest
+      if: branch = auto
     - env: IMAGE=x86_64-gnu-debug
       if: branch = auto
     - env: IMAGE=x86_64-gnu-nopt
diff --git a/appveyor.yml b/appveyor.yml
index 599d1b40ceb1e..b86fa25337b00 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -25,6 +25,11 @@ environment:
     RUST_CHECK_TARGET: check-aux
     RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc
 
+  # MSVC cargotest
+  - MSYS_BITS: 64
+    SCRIPT: python x.py test src/tools/cargotest
+    RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc
+
   # 32/64-bit MinGW builds.
   #
   # We are using MinGW with posix threads since LLVM does not compile with
diff --git a/src/bootstrap/mk/Makefile.in b/src/bootstrap/mk/Makefile.in
index 004f0c31024cd..eb92c8f143bef 100644
--- a/src/bootstrap/mk/Makefile.in
+++ b/src/bootstrap/mk/Makefile.in
@@ -52,7 +52,6 @@ check:
 	$(Q)$(BOOTSTRAP) test $(BOOTSTRAP_ARGS)
 check-aux:
 	$(Q)$(BOOTSTRAP) test \
-		src/tools/cargotest \
 		src/tools/cargo \
 		src/tools/rls \
 		src/tools/rustfmt \
diff --git a/src/ci/docker/x86_64-gnu-cargotest/Dockerfile b/src/ci/docker/x86_64-gnu-cargotest/Dockerfile
new file mode 100644
index 0000000000000..05c9f06ca9a79
--- /dev/null
+++ b/src/ci/docker/x86_64-gnu-cargotest/Dockerfile
@@ -0,0 +1,21 @@
+FROM ubuntu:16.04
+
+RUN apt-get update && apt-get install -y --no-install-recommends \
+  g++ \
+  make \
+  file \
+  curl \
+  ca-certificates \
+  python2.7 \
+  git \
+  cmake \
+  libssl-dev \
+  sudo \
+  xz-utils \
+  pkg-config
+
+COPY scripts/sccache.sh /scripts/
+RUN sh /scripts/sccache.sh
+
+ENV RUST_CONFIGURE_ARGS --build=x86_64-unknown-linux-gnu
+ENV SCRIPT python2.7 ../x.py test src/tools/cargotest