summary refs log tree commit diff
path: root/src/ci/docker
diff options
context:
space:
mode:
authorGuillaume Gomez <guillaume1.gomez@gmail.com>2023-09-08 14:10:50 +0200
committerGitHub <noreply@github.com>2023-09-08 14:10:50 +0200
commitdcb465995da3309bda9ba1fa286cb4d6a6c77e99 (patch)
treeb9ea89a6bbd69860a23767d08231817207a5987c /src/ci/docker
parent2cceedd0ef9fc26250f3d27f7fd4e980f1deb72d (diff)
parent45abd8caf2d596a520a8b712967aa19d799d002b (diff)
downloadrust-dcb465995da3309bda9ba1fa286cb4d6a6c77e99.tar.gz
rust-dcb465995da3309bda9ba1fa286cb4d6a6c77e99.zip
Rollup merge of #115088 - LuuuXXX:issue-112009, r=albertlarsan68
Fix Step Skipping Caused by Using the `--exclude` Option

The original code was overreacting to the `--exclude` option,
https://github.com/rust-lang/rust/blob/eadf69a6c6edfe220fc5b1b659e46e271d75a3a1/src/bootstrap/builder.rs#L257-L260
For example:
When `x test --exclude alloc` or `x test --exclude library/alloc` is passed, the entire libraray test is skipped.

Related issues:
https://github.com/rust-lang/rust/issues/112009
Diffstat (limited to 'src/ci/docker')
-rw-r--r--src/ci/docker/host-x86_64/wasm32/Dockerfile3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/ci/docker/host-x86_64/wasm32/Dockerfile b/src/ci/docker/host-x86_64/wasm32/Dockerfile
index 02b4664eb55..0d0f1edd003 100644
--- a/src/ci/docker/host-x86_64/wasm32/Dockerfile
+++ b/src/ci/docker/host-x86_64/wasm32/Dockerfile
@@ -58,5 +58,6 @@ ENV NO_CHANGE_USER=1
 RUN chown 10719 -R /emsdk-portable/
 
 # Exclude library/alloc due to OOM in benches.
+# FIXME: Fix std tests
 ENV SCRIPT python3 ../x.py test --stage 2 --host='' --target $TARGETS \
-    --skip library/alloc
+    --skip library/alloc --skip library/std