diff options
| author | Philipp Hansch <dev@phansch.net> | 2018-12-20 16:38:28 +0100 |
|---|---|---|
| committer | Philipp Hansch <dev@phansch.net> | 2018-12-20 18:00:07 +0100 |
| commit | 0493c9977796b22eabeb410f823c38451cc71be4 (patch) | |
| tree | 3b0085f3f6b6dd54e75bf95845f28b10e704c72c /src/ci/docker | |
| parent | 2d2435b47e85d461cbc8047801a2df698364892d (diff) | |
| download | rust-0493c9977796b22eabeb410f823c38451cc71be4.tar.gz rust-0493c9977796b22eabeb410f823c38451cc71be4.zip | |
Move compiletest test run to mingw-check builder
This way, checktools.sh continues to be used only for tools that are published later on.
Diffstat (limited to 'src/ci/docker')
| -rw-r--r-- | src/ci/docker/mingw-check/Dockerfile | 3 | ||||
| -rwxr-xr-x | src/ci/docker/x86_64-gnu-tools/checktools.sh | 5 |
2 files changed, 2 insertions, 6 deletions
diff --git a/src/ci/docker/mingw-check/Dockerfile b/src/ci/docker/mingw-check/Dockerfile index 10aedf6a60e..24e2dea4ca7 100644 --- a/src/ci/docker/mingw-check/Dockerfile +++ b/src/ci/docker/mingw-check/Dockerfile @@ -21,4 +21,5 @@ RUN sh /scripts/sccache.sh ENV RUN_CHECK_WITH_PARALLEL_QUERIES 1 ENV SCRIPT python2.7 ../x.py check --target=i686-pc-windows-gnu --host=i686-pc-windows-gnu && \ - python2.7 ../x.py build --stage 0 src/tools/build-manifest + python2.7 ../x.py build --stage 0 src/tools/build-manifest && \ + python2.7 ../x.py test --stage 0 src/tools/compiletest diff --git a/src/ci/docker/x86_64-gnu-tools/checktools.sh b/src/ci/docker/x86_64-gnu-tools/checktools.sh index 5da97cc9a84..d876cb7f37a 100755 --- a/src/ci/docker/x86_64-gnu-tools/checktools.sh +++ b/src/ci/docker/x86_64-gnu-tools/checktools.sh @@ -37,11 +37,6 @@ python2.7 "$X_PY" test --no-fail-fast \ src/tools/rls \ src/tools/rustfmt \ src/tools/miri \ - src/tools/compiletest - -# Note that compiletest here is an exception from the other tools. -# We are only executing the unit tests of it. We don't need to track the -# toolstate because it's not distributed as a tool like the other items. set -e |