diff options
| author | Simon Sapin <simon.sapin@exyr.org> | 2017-09-15 20:31:48 +0200 |
|---|---|---|
| committer | Simon Sapin <simon.sapin@exyr.org> | 2017-10-23 13:12:12 +0200 |
| commit | f4f18586e755f239b5be3a60a6e3bfd382524210 (patch) | |
| tree | c1d8fe6c533f0336937a4318f3ace3435302e839 | |
| parent | 5167aac3c43fb3e727831658b780acde49b42ff7 (diff) | |
| download | rust-f4f18586e755f239b5be3a60a6e3bfd382524210.tar.gz rust-f4f18586e755f239b5be3a60a6e3bfd382524210.zip | |
Move cargotest to separate jobs on Travis-CI and AppVeyor
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | appveyor.yml | 5 | ||||
| -rw-r--r-- | src/bootstrap/mk/Makefile.in | 1 | ||||
| -rw-r--r-- | src/ci/docker/x86_64-gnu-cargotest/Dockerfile | 21 |
4 files changed, 28 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index c76e17a27d1..db34f140448 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 599d1b40ceb..b86fa25337b 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 004f0c31024..eb92c8f143b 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 00000000000..05c9f06ca9a --- /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 |