diff options
| author | kennytm <kennytm@gmail.com> | 2017-10-19 23:13:29 +0800 |
|---|---|---|
| committer | kennytm <kennytm@gmail.com> | 2017-10-20 00:01:52 +0800 |
| commit | 342e01b742d8b4a2823cbe9a357c04cd469f4cbc (patch) | |
| tree | d625a7c5d9b26482d2e35d2ce4e3c5f7395b490e /src/ci | |
| parent | 207dab577330be6da19094c4ff1fbc1988464ecf (diff) | |
| parent | d9ecdfe3a7a579b9ec89355168f13760c670d4d4 (diff) | |
| download | rust-342e01b742d8b4a2823cbe9a357c04cd469f4cbc.tar.gz rust-342e01b742d8b4a2823cbe9a357c04cd469f4cbc.zip | |
Rollup merge of #45352 - alexcrichton:emscripten-tests, r=nikomatsakis
test: Update Emscripten failures/passing All tests should now have annotation for *why* they're ignored on emscripten. A few tests no longer need such an annotation as well! Closes #41299
Diffstat (limited to 'src/ci')
| -rw-r--r-- | src/ci/docker/asmjs/Dockerfile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/ci/docker/asmjs/Dockerfile b/src/ci/docker/asmjs/Dockerfile index 28caf1fb57a..c0bf689e39d 100644 --- a/src/ci/docker/asmjs/Dockerfile +++ b/src/ci/docker/asmjs/Dockerfile @@ -16,6 +16,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ COPY scripts/emscripten.sh /scripts/ RUN bash /scripts/emscripten.sh +COPY scripts/sccache.sh /scripts/ +RUN sh /scripts/sccache.sh + ENV PATH=$PATH:/emsdk-portable ENV PATH=$PATH:/emsdk-portable/clang/e1.37.13_64bit/ ENV PATH=$PATH:/emsdk-portable/emscripten/1.37.13/ @@ -28,7 +31,4 @@ ENV TARGETS=asmjs-unknown-emscripten ENV RUST_CONFIGURE_ARGS --target=$TARGETS -ENV SCRIPT python2.7 ../x.py test --target $TARGETS - -COPY scripts/sccache.sh /scripts/ -RUN sh /scripts/sccache.sh +ENV SCRIPT python2.7 ../x.py test --target $TARGETS src/test/run-pass |