diff options
| author | Mateusz Mikuła <matti@marinelayer.io> | 2019-03-12 17:15:03 +0100 |
|---|---|---|
| committer | Mateusz Mikuła <mati865@gmail.com> | 2019-03-13 22:21:06 +0100 |
| commit | 66de5c6e90ff3975bcef01de90bac82a8e92fc8f (patch) | |
| tree | d4778b4cbbee225ec5f9b7f6b83f48583480ca8c | |
| parent | 4dd57efae294a13a132b97325e7e89bc763e85e0 (diff) | |
| download | rust-66de5c6e90ff3975bcef01de90bac82a8e92fc8f.tar.gz rust-66de5c6e90ff3975bcef01de90bac82a8e92fc8f.zip | |
Move testing to test-various
| -rw-r--r-- | src/ci/docker/dist-x86_64-musl/Dockerfile | 4 | ||||
| -rw-r--r-- | src/ci/docker/test-various/Dockerfile | 20 |
2 files changed, 19 insertions, 5 deletions
diff --git a/src/ci/docker/dist-x86_64-musl/Dockerfile b/src/ci/docker/dist-x86_64-musl/Dockerfile index 3a95bfd6ef4..543b9377357 100644 --- a/src/ci/docker/dist-x86_64-musl/Dockerfile +++ b/src/ci/docker/dist-x86_64-musl/Dockerfile @@ -50,6 +50,4 @@ ENV HOSTS=x86_64-unknown-linux-musl \ ENV RUSTFLAGS="-C target-feature=-crt-static" -ENV SCRIPT \ - python2.7 ../x.py test --host $HOSTS --target $HOSTS && \ - python2.7 ../x.py dist --host $HOSTS --target $HOSTS +ENV SCRIPT python2.7 ../x.py dist --host $HOSTS --target $HOSTS diff --git a/src/ci/docker/test-various/Dockerfile b/src/ci/docker/test-various/Dockerfile index 6c419e13c9f..f70ea9da92e 100644 --- a/src/ci/docker/test-various/Dockerfile +++ b/src/ci/docker/test-various/Dockerfile @@ -11,7 +11,10 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ cmake \ sudo \ gdb \ - xz-utils + xz-utils \ + # for musl + wget \ + patch # 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 | \ @@ -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 | \ 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/ RUN sh /scripts/sccache.sh 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 rust.lld @@ -47,4 +58,9 @@ ENV NVPTX_TARGETS=nvptx64-nvidia-cuda ENV NVPTX_SCRIPT python2.7 /checkout/x.py test --target $NVPTX_TARGETS \ 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 |