bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Fix an error in the appveyor config

Browse source
This commit is contained in:
Alex Crichton 2018-03-07 13:57:17 -08:00
parent 7c050445a9
commit 16cc9ce8a2
2 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
appveyor.yml
View file

@ -27,7 +27,7 @@ environment:
# MSVC aux tests # MSVC aux tests
- MSYS_BITS: 64 - MSYS_BITS: 64
RUST_CHECK_TARGET: check-aux AUX_ARGS="--exclude src/tools/cargotest --exclude src/tools/cargo" RUST_CHECK_TARGET: check-aux EXCLUDE_CARGO=1
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc
- MSYS_BITS: 64 - MSYS_BITS: 64
SCRIPT: python x.py test src/tools/cargotest src/tools/cargo SCRIPT: python x.py test src/tools/cargotest src/tools/cargo

8
src/bootstrap/mk/Makefile.in
View file

@ -16,6 +16,12 @@ Q := @
BOOTSTRAP_ARGS := BOOTSTRAP_ARGS :=
endif endif
ifdef EXCLUDE_CARGO
AUX_ARGS := src/tools/cargo src/tools/cargotest
else
AUX_ARGS :=
endif
BOOTSTRAP := $(CFG_PYTHON) $(CFG_SRC_DIR)src/bootstrap/bootstrap.py BOOTSTRAP := $(CFG_PYTHON) $(CFG_SRC_DIR)src/bootstrap/bootstrap.py
all: all:
@ -52,8 +58,6 @@ check:
$(Q)$(BOOTSTRAP) test $(BOOTSTRAP_ARGS) $(Q)$(BOOTSTRAP) test $(BOOTSTRAP_ARGS)
check-aux: check-aux:
$(Q)$(BOOTSTRAP) test \ $(Q)$(BOOTSTRAP) test \
src/tools/cargo \
src/tools/cargotest \
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 \