diff options
| author | Denys Zariaiev <denys.zariaiev@gmail.com> | 2019-01-29 19:06:42 +0100 |
|---|---|---|
| committer | Denys Zariaiev <denys.zariaiev@gmail.com> | 2019-01-29 19:06:42 +0100 |
| commit | 899d936dee555ef2ac67e68a5017ccb0d1e9a697 (patch) | |
| tree | 899aafb007701189d3024e9f10542676e1f6f966 /src/ci | |
| parent | 6f86a70ea13cbe8b32c6e6ed76b8f57be4d70c68 (diff) | |
| download | rust-899d936dee555ef2ac67e68a5017ccb0d1e9a697.tar.gz rust-899d936dee555ef2ac67e68a5017ccb0d1e9a697.zip | |
Merge NVPTX and WASM test images into `test-various`
Diffstat (limited to 'src/ci')
| -rw-r--r-- | src/ci/docker/test-various/Dockerfile (renamed from src/ci/docker/wasm32-unknown/Dockerfile) | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/src/ci/docker/wasm32-unknown/Dockerfile b/src/ci/docker/test-various/Dockerfile index 161f0c0062f..a5ae94262c1 100644 --- a/src/ci/docker/wasm32-unknown/Dockerfile +++ b/src/ci/docker/test-various/Dockerfile @@ -13,14 +13,16 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ gdb \ xz-utils +# FIXME: build the `ptx-linker` instead. +RUN curl -sL https://github.com/denzp/rust-ptx-linker/releases/download/v0.9.0-alpha.1/rust-ptx-linker.linux64.tar.gz | \ + tar -xzvC /usr/bin + RUN curl -sL https://nodejs.org/dist/v9.2.0/node-v9.2.0-linux-x64.tar.xz | \ - tar -xJ + tar -xJ COPY scripts/sccache.sh /scripts/ RUN sh /scripts/sccache.sh -ENV TARGETS=wasm32-unknown-unknown - ENV RUST_CONFIGURE_ARGS \ --set build.nodejs=/node-v9.2.0-linux-x64/bin/node \ --set rust.lld @@ -31,11 +33,18 @@ ENV RUST_CONFIGURE_ARGS \ # other contexts as well ENV NO_DEBUG_ASSERTIONS=1 -ENV SCRIPT python2.7 /checkout/x.py test --target $TARGETS \ +ENV WASM_TARGETS=wasm32-unknown-unknown +ENV WASM_SCRIPT python2.7 /checkout/x.py test --target $WASM_TARGETS \ src/test/run-make \ src/test/ui \ src/test/run-pass \ src/test/compile-fail \ src/test/mir-opt \ src/test/codegen-units \ - src/libcore \ + src/libcore + +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 |