diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2018-03-07 11:47:59 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2018-03-07 11:47:59 -0800 |
| commit | 7c050445a9067fac39d8cf3544f8df8e6704cca8 (patch) | |
| tree | f3b21d0c6f5d1b1e5335ee8f80eb91e2187cdf36 | |
| parent | a752453098d90bfec397a8cafca55bc56b5a7ef8 (diff) | |
| parent | 7f465abd4f5c3269b1c7b2e99eeb1ff56fe846d5 (diff) | |
Merge branch 'shard-msvc-more' of https://github.com/alexcrichton/rust into rollup
| -rw-r--r-- | appveyor.yml | 12 | ||||
| -rw-r--r-- | src/bootstrap/mk/Makefile.in | 1 | ||||
| -rwxr-xr-x | src/ci/run.sh | 2 |
3 files changed, 11 insertions, 4 deletions
diff --git a/appveyor.yml b/appveyor.yml index 0735ead8923..fc1bb95b9b7 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -19,12 +19,18 @@ environment: RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-profiler SCRIPT: python x.py test - MSYS_BITS: 32 - RUST_CONFIGURE_ARGS: --build=i686-pc-windows-msvc --target=i686-pc-windows-msvc - SCRIPT: python x.py test --host i686-pc-windows-msvc --target i686-pc-windows-msvc + RUST_CONFIGURE_ARGS: --build=i686-pc-windows-msvc + SCRIPT: python x.py test --exclude src/test/run-pass --exclude src/test/compile-fail + - MSYS_BITS: 32 + RUST_CONFIGURE_ARGS: --build=i686-pc-windows-msvc + SCRIPT: python x.py test src/test/run-pass src/test/compile-fail # MSVC aux tests - MSYS_BITS: 64 - RUST_CHECK_TARGET: check-aux + RUST_CHECK_TARGET: check-aux AUX_ARGS="--exclude src/tools/cargotest --exclude src/tools/cargo" + RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc + - MSYS_BITS: 64 + SCRIPT: python x.py test src/tools/cargotest src/tools/cargo RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc # MSVC tools tests diff --git a/src/bootstrap/mk/Makefile.in b/src/bootstrap/mk/Makefile.in index 925a361f0b2..97ea792c780 100644 --- a/src/bootstrap/mk/Makefile.in +++ b/src/bootstrap/mk/Makefile.in @@ -60,6 +60,7 @@ check-aux: src/test/run-pass-valgrind/pretty \ src/test/run-pass-fulldeps/pretty \ src/test/run-fail-fulldeps/pretty \ + $(AUX_ARGS) \ $(BOOTSTRAP_ARGS) check-bootstrap: $(Q)$(CFG_PYTHON) $(CFG_SRC_DIR)src/bootstrap/bootstrap_test.py diff --git a/src/ci/run.sh b/src/ci/run.sh index 3be1c255c16..79300e08a7d 100755 --- a/src/ci/run.sh +++ b/src/ci/run.sh @@ -104,7 +104,7 @@ else travis_fold start "make-$1" travis_time_start echo "make -j $ncpus $1" - make -j $ncpus "$1" + make -j $ncpus $1 local retval=$? travis_fold end "make-$1" travis_time_finish |