squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Move testing to test-various

Browse source
This commit is contained in:
Mateusz Mikuła 2019-03-12 17:15:03 +01:00 committed by Mateusz Mikuła
parent 4dd57efae2
commit 66de5c6e90
2 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/ci/docker/dist-x86_64-musl/Dockerfile
View file

@ -50,6 +50,4 @@ ENV HOSTS=x86_64-unknown-linux-musl \
ENV RUSTFLAGS="-C target-feature=-crt-static" ENV RUSTFLAGS="-C target-feature=-crt-static"
ENV SCRIPT \ ENV SCRIPT python2.7 ../x.py dist --host $HOSTS --target $HOSTS
python2.7 ../x.py test --host $HOSTS --target $HOSTS && \
python2.7 ../x.py dist --host $HOSTS --target $HOSTS

20
src/ci/docker/test-various/Dockerfile
View file

@ -11,7 +11,10 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
cmake \ cmake \
sudo \ sudo \
gdb \ gdb \
xz-utils xz-utils \
# for musl
wget \
patch
# FIXME: build the `ptx-linker` instead. # FIXME: build the `ptx-linker` instead.
RUN curl -sL https://github.com/denzp/rust-ptx-linker/releases/download/v0.9.0-alpha.2/rust-ptx-linker.linux64.tar.gz | \ RUN curl -sL https://github.com/denzp/rust-ptx-linker/releases/download/v0.9.0-alpha.2/rust-ptx-linker.linux64.tar.gz | \
@ -20,10 +23,18 @@ RUN curl -sL https://github.com/denzp/rust-ptx-linker/releases/download/v0.9.0-a
RUN curl -sL https://nodejs.org/dist/v9.2.0/node-v9.2.0-linux-x64.tar.xz | \ RUN curl -sL https://nodejs.org/dist/v9.2.0/node-v9.2.0-linux-x64.tar.xz | \
tar -xJ tar -xJ
WORKDIR /build/
COPY scripts/musl-toolchain.sh /build/
RUN CFLAGS="-Wa,-mrelax-relocations=no" \
CXXFLAGS="-Wa,-mrelax-relocations=no" \
bash musl-toolchain.sh x86_64-linux-musl && rm -rf build
WORKDIR /
COPY scripts/sccache.sh /scripts/ COPY scripts/sccache.sh /scripts/
RUN sh /scripts/sccache.sh RUN sh /scripts/sccache.sh
ENV RUST_CONFIGURE_ARGS \ ENV RUST_CONFIGURE_ARGS \
--musl-root-x86_64=/usr/local/x86_64-linux-musl \
--set build.nodejs=/node-v9.2.0-linux-x64/bin/node \ --set build.nodejs=/node-v9.2.0-linux-x64/bin/node \
--set rust.lld --set rust.lld
@ -47,4 +58,9 @@ ENV NVPTX_TARGETS=nvptx64-nvidia-cuda
ENV NVPTX_SCRIPT python2.7 /checkout/x.py test --target $NVPTX_TARGETS \ ENV NVPTX_SCRIPT python2.7 /checkout/x.py test --target $NVPTX_TARGETS \
src/test/run-make src/test/run-make
ENV SCRIPT $WASM_SCRIPT && $NVPTX_SCRIPT 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 python2.7 /checkout/x.py test --target $MUSL_TARGETS
ENV SCRIPT $WASM_SCRIPT && $NVPTX_SCRIPT && $MUSL_SCRIPT