OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update CI scripts to accommodate --host change

Browse Source
This commit is contained in:
Tyler Mandry 2020-09-25 01:21:05 +00:00
parent 52ca5ca7b7
commit ed975054aa
11 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ci/docker/host-x86_64/arm-android/Dockerfile
View File

@ -31,7 +31,7 @@ ENV TARGETS=arm-linux-androideabi
ENV RUST_CONFIGURE_ARGS --arm-linux-androideabi-ndk=/android/ndk/arm-14
ENV SCRIPT python3 ../x.py --stage 2 test --target $TARGETS
ENV SCRIPT python3 ../x.py --stage 2 test --host '' --target $TARGETS
COPY scripts/sccache.sh /scripts/
RUN sh /scripts/sccache.sh

2
src/ci/docker/host-x86_64/armhf-gnu/Dockerfile
View File

@ -79,6 +79,6 @@ COPY scripts/sccache.sh /scripts/
RUN sh /scripts/sccache.sh
ENV RUST_CONFIGURE_ARGS --qemu-armhf-rootfs=/tmp/rootfs
ENV SCRIPT python3 ../x.py --stage 2 test --target arm-unknown-linux-gnueabihf
ENV SCRIPT python3 ../x.py --stage 2 test --host '' --target arm-unknown-linux-gnueabihf
ENV NO_CHANGE_USER=1

2
src/ci/docker/host-x86_64/disabled/asmjs/Dockerfile
View File

@ -34,7 +34,7 @@ ENV EMCC_CFLAGS=-O1
# Emscripten installation is user-specific
ENV NO_CHANGE_USER=1
ENV SCRIPT python3 ../x.py --stage 2 test --target $TARGETS
ENV SCRIPT python3 ../x.py --stage 2 test --host '' --target $TARGETS
# This is almost identical to the wasm32-unknown-emscripten target, so
# running with assertions again is not useful

2
src/ci/docker/host-x86_64/disabled/dist-x86_64-redox/Dockerfile
View File

@ -19,4 +19,4 @@ ENV \
CXX_x86_64_unknown_redox=x86_64-unknown-redox-g++
ENV RUST_CONFIGURE_ARGS --enable-extended
ENV SCRIPT python3 ../x.py dist --target x86_64-unknown-redox
ENV SCRIPT python3 ../x.py dist --host '' --target x86_64-unknown-redox

2
src/ci/docker/host-x86_64/dist-android/Dockerfile
View File

@ -32,7 +32,7 @@ ENV RUST_CONFIGURE_ARGS \
--x86_64-linux-android-ndk=/android/ndk/x86_64-21 \
--disable-docs
ENV SCRIPT python3 ../x.py dist --target $TARGETS
ENV SCRIPT python3 ../x.py dist --host '' --target $TARGETS
COPY scripts/sccache.sh /scripts/
RUN sh /scripts/sccache.sh

4
src/ci/docker/host-x86_64/dist-i586-gnu-i586-i686-musl/Dockerfile
View File

@ -47,5 +47,5 @@ ENV CFLAGS_i586_unknown_linux_musl=-Wa,-mrelax-relocations=no
ENV TARGETS=i586-unknown-linux-gnu,i686-unknown-linux-musl
ENV SCRIPT \
python3 ../x.py --stage 2 test --target $TARGETS && \
python3 ../x.py dist --target $TARGETS,i586-unknown-linux-musl
python3 ../x.py --stage 2 test --host '' --target $TARGETS && \
python3 ../x.py dist --host '' --target $TARGETS,i586-unknown-linux-musl

4
src/ci/docker/host-x86_64/dist-various-1/Dockerfile
View File

@ -187,8 +187,8 @@ ENV RUST_CONFIGURE_ARGS \
--disable-docs
ENV SCRIPT \
python3 ../x.py --stage 2 test --target $RUN_MAKE_TARGETS src/test/run-make && \
python3 ../x.py dist --target $TARGETS
python3 ../x.py --stage 2 test --host '' --target $RUN_MAKE_TARGETS src/test/run-make && \
python3 ../x.py dist --host '' --target $TARGETS
# sccache
COPY scripts/sccache.sh /scripts/

2
src/ci/docker/host-x86_64/dist-various-2/Dockerfile
View File

@ -110,4 +110,4 @@ ENV RUST_CONFIGURE_ARGS --enable-extended --enable-lld --disable-docs \
--set target.wasm32-wasi.wasi-root=/wasm32-wasi \
--musl-root-armv7=/musl-armv7
ENV SCRIPT python3 ../x.py dist --target $TARGETS
ENV SCRIPT python3 ../x.py dist --host '' --target $TARGETS

6
src/ci/docker/host-x86_64/test-various/Dockerfile
View File

@ -41,7 +41,7 @@ ENV RUST_CONFIGURE_ARGS \
ENV NO_DEBUG_ASSERTIONS=1
ENV WASM_TARGETS=wasm32-unknown-unknown
ENV WASM_SCRIPT python3 /checkout/x.py --stage 2 test --target $WASM_TARGETS \
ENV WASM_SCRIPT python3 /checkout/x.py --stage 2 test --host '' --target $WASM_TARGETS \
src/test/run-make \
src/test/ui \
src/test/compile-fail \
@ -50,13 +50,13 @@ ENV WASM_SCRIPT python3 /checkout/x.py --stage 2 test --target $WASM_TARGETS \
library/core
ENV NVPTX_TARGETS=nvptx64-nvidia-cuda
ENV NVPTX_SCRIPT python3 /checkout/x.py --stage 2 test --target $NVPTX_TARGETS \
ENV NVPTX_SCRIPT python3 /checkout/x.py --stage 2 test --host '' --target $NVPTX_TARGETS \
src/test/run-make \
src/test/assembly
ENV MUSL_TARGETS=x86_64-unknown-linux-musl \
CC_x86_64_unknown_linux_musl=x86_64-linux-musl-gcc \
CXX_x86_64_unknown_linux_musl=x86_64-linux-musl-g++
ENV MUSL_SCRIPT python3 /checkout/x.py --stage 2 test --target $MUSL_TARGETS
ENV MUSL_SCRIPT python3 /checkout/x.py --stage 2 test --host '' --target $MUSL_TARGETS
ENV SCRIPT $WASM_SCRIPT && $NVPTX_SCRIPT && $MUSL_SCRIPT

2
src/ci/docker/host-x86_64/wasm32/Dockerfile
View File

@ -53,7 +53,7 @@ ENV NO_CHANGE_USER=1
# FIXME: Re-enable these tests once https://github.com/rust-lang/cargo/pull/7476
# is picked up by CI
ENV SCRIPT python3 ../x.py test --stage 2 --target $TARGETS \
ENV SCRIPT python3 ../x.py test --stage 2 --host '' --target $TARGETS \
--exclude library/core \
--exclude library/alloc \
--exclude library/proc_macro \

2
src/ci/docker/host-x86_64/x86_64-gnu-llvm-8/Dockerfile
View File

@ -45,7 +45,7 @@ ENV SCRIPT python2.7 ../x.py --stage 2 test --exclude src/tools/tidy && \
# on the `x86_64` host when they're built as `armv5te` binaries.
# (we're only interested in the MIR output, so this doesn't matter)
python2.7 ../x.py --stage 2 test src/test/mir-opt --pass=build \
--target=armv5te-unknown-linux-gnueabi && \
--host='' --target=armv5te-unknown-linux-gnueabi && \
# Run the UI test suite again, but in `--pass=check` mode
#
# This is intended to make sure that both `--pass=check` continues to