diff options
| author | Thomas Lively <tlively@google.com> | 2019-10-02 11:02:25 -0700 |
|---|---|---|
| committer | Thomas Lively <tlively@google.com> | 2019-10-04 00:47:21 -0700 |
| commit | 5b56c660c9cf55b240d26854fa0ffd41db068ff9 (patch) | |
| tree | 03bc9b23e0f08f0f94054e85d64672a769c7e339 /src/ci | |
| parent | 9a55103b985fdd4a7d90db5d46ebaf0a9e34b419 (diff) | |
| download | rust-5b56c660c9cf55b240d26854fa0ffd41db068ff9.tar.gz rust-5b56c660c9cf55b240d26854fa0ffd41db068ff9.zip | |
Fix ABI, run and fix more tests, re-enable CI for PRs
Diffstat (limited to 'src/ci')
| -rw-r--r-- | src/ci/azure-pipelines/pr.yml | 4 | ||||
| -rw-r--r-- | src/ci/docker/asmjs/Dockerfile | 3 | ||||
| -rw-r--r-- | src/ci/docker/disabled/wasm32/Dockerfile | 10 |
3 files changed, 13 insertions, 4 deletions
diff --git a/src/ci/azure-pipelines/pr.yml b/src/ci/azure-pipelines/pr.yml index 62e23efe1ef..07c79d8cc96 100644 --- a/src/ci/azure-pipelines/pr.yml +++ b/src/ci/azure-pipelines/pr.yml @@ -22,6 +22,10 @@ jobs: IMAGE: x86_64-gnu-llvm-6.0 mingw-check: IMAGE: mingw-check + asmjs: + IMAGE: asmjs + wasm32: + IMAGE: wasm32 - job: LinuxTools timeoutInMinutes: 600 diff --git a/src/ci/docker/asmjs/Dockerfile b/src/ci/docker/asmjs/Dockerfile index cbb9b257051..d136fae79aa 100644 --- a/src/ci/docker/asmjs/Dockerfile +++ b/src/ci/docker/asmjs/Dockerfile @@ -28,8 +28,7 @@ ENV EM_CONFIG=/emsdk-portable/.emscripten ENV TARGETS=asmjs-unknown-emscripten -# TODO: Run run-fail, libcore, libstd, etc. once exceptions are enabled -ENV SCRIPT python2.7 ../x.py test --target $TARGETS src/test/ui +ENV SCRIPT python2.7 ../x.py test --target $TARGETS # This is almost identical to the wasm32-unknown-emscripten target, so # running with assertions again is not useful diff --git a/src/ci/docker/disabled/wasm32/Dockerfile b/src/ci/docker/disabled/wasm32/Dockerfile index 5d91691f6ee..b2cf862c0a5 100644 --- a/src/ci/docker/disabled/wasm32/Dockerfile +++ b/src/ci/docker/disabled/wasm32/Dockerfile @@ -28,5 +28,11 @@ ENV EM_CONFIG=/emsdk-portable/.emscripten ENV TARGETS=wasm32-unknown-emscripten -# TODO: Run run-fail, libcore, libstd, etc. once exceptions are enabled -ENV SCRIPT python2.7 ../x.py test --target $TARGETS src/test/ui +# FIXME: Re-enable these tests once Cargo stops trying to execute wasms +ENV SCRIPT python2.7 ../x.py test --target $TARGETS \ + --exclude src/libcore \ + --exclude src/liballoc \ + --exclude src/libproc_macro \ + --exclude src/libstd \ + --exclude src/libterm \ + --exclude src/libtest |