From 2d2435b47e85d461cbc8047801a2df698364892d Mon Sep 17 00:00:00 2001 From: Philipp Hansch Date: Thu, 20 Dec 2018 16:03:49 +0100 Subject: [PATCH 1/2] Run compiletest tests on CI I was assuming that https://github.com/rust-lang/rust/pull/56792 would have resulted in compiletest tests being executed in CI. However, I couldn't find any mentions of the unit test names in any CI logs. This adds the compiletest test execution to the checktools.sh script. --- src/ci/docker/x86_64-gnu-tools/checktools.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/ci/docker/x86_64-gnu-tools/checktools.sh b/src/ci/docker/x86_64-gnu-tools/checktools.sh index d876cb7f37a41..5da97cc9a8480 100755 --- a/src/ci/docker/x86_64-gnu-tools/checktools.sh +++ b/src/ci/docker/x86_64-gnu-tools/checktools.sh @@ -37,6 +37,11 @@ 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 From 0493c9977796b22eabeb410f823c38451cc71be4 Mon Sep 17 00:00:00 2001 From: Philipp Hansch Date: Thu, 20 Dec 2018 16:38:28 +0100 Subject: [PATCH 2/2] Move compiletest test run to mingw-check builder This way, checktools.sh continues to be used only for tools that are published later on. --- src/ci/docker/mingw-check/Dockerfile | 3 ++- 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 10aedf6a60e10..24e2dea4ca773 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 5da97cc9a8480..d876cb7f37a41 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