diff options
| author | bors <bors@rust-lang.org> | 2017-07-26 18:27:19 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-07-26 18:27:19 +0000 |
| commit | d02fb3bcf42c05740a47fdfb0d9e5dd8ec24ff37 (patch) | |
| tree | c8843a67bdb0f73fbfa3bab96f9dd8c3c160a2b9 /src/ci/docker | |
| parent | 2fc3aec4316a76429a5a0c8d2eccb19bf81982d6 (diff) | |
| parent | 874ecdc09faf94d6591a803f7d73f60fd629cd70 (diff) | |
| download | rust-d02fb3bcf42c05740a47fdfb0d9e5dd8ec24ff37.tar.gz rust-d02fb3bcf42c05740a47fdfb0d9e5dd8ec24ff37.zip | |
Auto merge of #42059 - derekdreery:bugfix/fix_emscripten_tests, r=alexcrichton
Make compiletest set cwd before running js tests Proposed fix for #38800. Not all tests pass yet - I will mention failures here once the test suite has finished.
Diffstat (limited to 'src/ci/docker')
| -rw-r--r-- | src/ci/docker/disabled/wasm32/Dockerfile | 2 | ||||
| -rwxr-xr-x | src/ci/docker/disabled/wasm32/node.sh | 18 |
2 files changed, 1 insertions, 19 deletions
diff --git a/src/ci/docker/disabled/wasm32/Dockerfile b/src/ci/docker/disabled/wasm32/Dockerfile index 60b15d7afb4..bf9bf77e649 100644 --- a/src/ci/docker/disabled/wasm32/Dockerfile +++ b/src/ci/docker/disabled/wasm32/Dockerfile @@ -19,7 +19,6 @@ RUN sh /scripts/dumb-init.sh # emscripten COPY scripts/emscripten.sh /scripts/ RUN bash /scripts/emscripten.sh -COPY disabled/wasm32/node.sh /usr/local/bin/node COPY scripts/sccache.sh /scripts/ RUN sh /scripts/sccache.sh @@ -27,6 +26,7 @@ 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/ +ENV PATH=$PATH:/node-v8.0.0-linux-x64/bin/ ENV EMSCRIPTEN=/emsdk-portable/emscripten/1.37.13/ ENV BINARYEN_ROOT=/emsdk-portable/clang/e1.37.13_64bit/binaryen/ ENV EM_CONFIG=/emsdk-portable/.emscripten diff --git a/src/ci/docker/disabled/wasm32/node.sh b/src/ci/docker/disabled/wasm32/node.sh deleted file mode 100755 index dfa7f221ffa..00000000000 --- a/src/ci/docker/disabled/wasm32/node.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash -# Copyright 2017 The Rust Project Developers. See the COPYRIGHT -# file at the top-level directory of this distribution and at -# http://rust-lang.org/COPYRIGHT. -# -# Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or -# http://www.apache.org/licenses/LICENSE-2.0> or the MIT license -# <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your -# option. This file may not be copied, modified, or distributed -# except according to those terms. - -path="$(dirname $1)" -file="$(basename $1)" - -shift - -cd "$path" -exec /node-v8.0.0-linux-x64/bin/node "$file" "$@" |