diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2017-01-19 17:18:12 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2017-01-20 13:49:16 -0800 |
| commit | 72c3148bb34fe7365d33f78bd732385ab091f3cb (patch) | |
| tree | 5d71b9723dfe3c6b6e9bfe20737b0d7f59b321b7 /src/ci/docker/emscripten | |
| parent | 5e8d7a4b7c2bfa3c278b93c0a81e151357f9b819 (diff) | |
| download | rust-72c3148bb34fe7365d33f78bd732385ab091f3cb.tar.gz rust-72c3148bb34fe7365d33f78bd732385ab091f3cb.zip | |
More test fixes from rollup
Diffstat (limited to 'src/ci/docker/emscripten')
| -rwxr-xr-x | src/ci/docker/emscripten/build-emscripten.sh | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/src/ci/docker/emscripten/build-emscripten.sh b/src/ci/docker/emscripten/build-emscripten.sh index 2ce7a58ae66..88bf583007c 100755 --- a/src/ci/docker/emscripten/build-emscripten.sh +++ b/src/ci/docker/emscripten/build-emscripten.sh @@ -11,9 +11,26 @@ set -ex +hide_output() { + set +x + on_err=" +echo ERROR: An error was encountered with the build. +cat /tmp/build.log +exit 1 +" + trap "$on_err" ERR + bash -c "while true; do sleep 30; echo \$(date) - building ...; done" & + PING_LOOP_PID=$! + $@ &> /tmp/build.log + trap - ERR + kill $PING_LOOP_PID + rm /tmp/build.log + set -x +} + curl https://s3.amazonaws.com/mozilla-games/emscripten/releases/emsdk-portable.tar.gz | \ tar xzf - source emsdk_portable/emsdk_env.sh -emsdk update -emsdk install --build=Release sdk-tag-1.37.1-32bit -emsdk activate --build=Release sdk-tag-1.37.1-32bit +hide_output emsdk update +hide_output emsdk install --build=Release sdk-tag-1.37.1-32bit +hide_output emsdk activate --build=Release sdk-tag-1.37.1-32bit |