about summary refs log tree commit diff
diff options
context:
space:
mode:
authorYuki Okushi <huyuumi.dev@gmail.com>2020-03-04 14:21:38 +0900
committerYuki Okushi <huyuumi.dev@gmail.com>2020-03-05 22:59:54 +0900
commitd6a17b598f0e82535fc38c8455aed9571f44aaa2 (patch)
treed9e6a2e31fef28781f51e3d387ea85ae3c1e308a
parent592e9c37008c2389451d28874a748f5b38612ca5 (diff)
downloadrust-d6a17b598f0e82535fc38c8455aed9571f44aaa2.tar.gz
rust-d6a17b598f0e82535fc38c8455aed9571f44aaa2.zip
Move tidy check to mingw-check
-rw-r--r--src/ci/docker/mingw-check/Dockerfile1
-rw-r--r--src/ci/docker/x86_64-gnu-llvm-7/Dockerfile2
2 files changed, 2 insertions, 1 deletions
diff --git a/src/ci/docker/mingw-check/Dockerfile b/src/ci/docker/mingw-check/Dockerfile
index b2d96aed2a9..e973ba2e33c 100644
--- a/src/ci/docker/mingw-check/Dockerfile
+++ b/src/ci/docker/mingw-check/Dockerfile
@@ -25,4 +25,5 @@ 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 test --stage 0 src/tools/compiletest && \
+           python2.7 ../x.py test src/tools/tidy && \
            /scripts/validate-toolstate.sh
diff --git a/src/ci/docker/x86_64-gnu-llvm-7/Dockerfile b/src/ci/docker/x86_64-gnu-llvm-7/Dockerfile
index dc90c286f5c..284c1e763e5 100644
--- a/src/ci/docker/x86_64-gnu-llvm-7/Dockerfile
+++ b/src/ci/docker/x86_64-gnu-llvm-7/Dockerfile
@@ -28,7 +28,7 @@ ENV RUST_CONFIGURE_ARGS \
       --enable-llvm-link-shared \
       --set rust.thin-lto-import-instr-limit=10
 
-ENV SCRIPT python2.7 ../x.py test src/tools/tidy && python2.7 ../x.py test
+ENV SCRIPT python2.7 ../x.py test --exclude src/tools/tidy && python2.7 ../x.py test src/tools/tidy
 
 # The purpose of this container isn't to test with debug assertions and
 # this is run on all PRs, so let's get speedier builds by disabling these extra