nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-01 06:51:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move the swap the tools test and cargotest within check-aux.

Browse Source 
The cargotest job is renamed to tools for clarification.
This commit is contained in:
kennytm 2017-11-28 23:19:54 +08:00
parent 0bae745cd8
commit 128199e39c
No known key found for this signature in database
GPG Key ID: FEF6C8051D0E013C
5 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -168,7 +168,7 @@ matrix:
if: branch = auto if: branch = auto
- env: IMAGE=x86_64-gnu-aux - env: IMAGE=x86_64-gnu-aux
if: branch = auto if: branch = auto
- env: IMAGE=x86_64-gnu-cargotest - env: IMAGE=x86_64-gnu-tools
if: branch = auto if: branch = auto
- env: IMAGE=x86_64-gnu-debug - env: IMAGE=x86_64-gnu-debug
if: branch = auto if: branch = auto

9
appveyor.yml
View File

@ -25,9 +25,14 @@ environment:
RUST_CHECK_TARGET: check-aux RUST_CHECK_TARGET: check-aux
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc
# MSVC cargotest # MSVC tools tests
- MSYS_BITS: 64 - MSYS_BITS: 64
SCRIPT: python x.py test src/tools/cargotest SCRIPT: >
python x.py test --no-fail-fast
src/tools/rls
src/tools/rustfmt
src/tools/miri
src/tools/clippy
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc
# 32/64-bit MinGW builds. # 32/64-bit MinGW builds.

4
src/bootstrap/mk/Makefile.in
View File

@ -53,9 +53,7 @@ check:
check-aux: check-aux:
$(Q)$(BOOTSTRAP) test \ $(Q)$(BOOTSTRAP) test \
src/tools/cargo \ src/tools/cargo \
src/tools/rls \ src/tools/cargotest \
src/tools/rustfmt \
src/tools/miri \
src/test/pretty \ src/test/pretty \
src/test/run-pass/pretty \ src/test/run-pass/pretty \
src/test/run-fail/pretty \ src/test/run-fail/pretty \

6
src/ci/docker/x86_64-gnu-aux/Dockerfile
View File

@ -12,7 +12,11 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
libssl-dev \ libssl-dev \
sudo \ sudo \
xz-utils \ xz-utils \
pkg-config pkg-config \
libgl1-mesa-dev \
llvm-dev \
libfreetype6-dev \
libexpat1-dev
COPY scripts/sccache.sh /scripts/ COPY scripts/sccache.sh /scripts/
RUN sh /scripts/sccache.sh RUN sh /scripts/sccache.sh

12
src/ci/docker/x86_64-gnu-cargotest/Dockerfile → src/ci/docker/x86_64-gnu-tools/Dockerfile
View File

@ -12,14 +12,14 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
libssl-dev \ libssl-dev \
sudo \ sudo \
xz-utils \ xz-utils \
pkg-config \ pkg-config
libgl1-mesa-dev \
llvm-dev \
libfreetype6-dev \
libexpat1-dev
COPY scripts/sccache.sh /scripts/ COPY scripts/sccache.sh /scripts/
RUN sh /scripts/sccache.sh RUN sh /scripts/sccache.sh
ENV RUST_CONFIGURE_ARGS --build=x86_64-unknown-linux-gnu ENV RUST_CONFIGURE_ARGS --build=x86_64-unknown-linux-gnu
ENV SCRIPT python2.7 ../x.py test src/tools/cargotest ENV SCRIPT python2.7 ../x.py --no-fail-fast \
src/tools/rls \
src/tools/rustfmt \
src/tools/miri \
src/tools/clippy