diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2024-03-21 12:05:07 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-21 12:05:07 +0100 |
| commit | 697b02031121d0bc9a215469f541eeca2f643328 (patch) | |
| tree | e0b0c48d7ba24b565340063c82ce6eb04b87bb69 /src | |
| parent | 8106b542907da86741a3154e5fcf053a04ac3159 (diff) | |
| parent | a400dac8ca8799d16d7b635deb3d7047480efc2e (diff) | |
| download | rust-697b02031121d0bc9a215469f541eeca2f643328.tar.gz rust-697b02031121d0bc9a215469f541eeca2f643328.zip | |
Rollup merge of #122795 - alexcrichton:fix-wasm-beta-bootstrap, r=Mark-Simulacrum
Inherit `RUSTC_BOOTSTRAP` when testing wasm This is implemented with the freshly-released Wasmtime 19 and should prevent beta breakage from wasm tests that was observed and fixed in #122640 again.
Diffstat (limited to 'src')
| -rw-r--r-- | src/bootstrap/src/lib.rs | 7 | ||||
| -rw-r--r-- | src/ci/docker/host-x86_64/test-various/Dockerfile | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/src/bootstrap/src/lib.rs b/src/bootstrap/src/lib.rs index 64bb7bf01f7..f1edbb5ad8a 100644 --- a/src/bootstrap/src/lib.rs +++ b/src/bootstrap/src/lib.rs @@ -1389,6 +1389,13 @@ impl Build { if let Some(path) = finder.maybe_have("wasmtime") { if let Ok(mut path) = path.into_os_string().into_string() { path.push_str(" run -C cache=n --dir ."); + // Make sure that tests have access to RUSTC_BOOTSTRAP. This (for example) is + // required for libtest to work on beta/stable channels. + // + // NB: with Wasmtime 20 this can change to `-S inherit-env` to + // inherit the entire environment rather than just this single + // environment variable. + path.push_str(" --env RUSTC_BOOTSTRAP"); return Some(path); } } diff --git a/src/ci/docker/host-x86_64/test-various/Dockerfile b/src/ci/docker/host-x86_64/test-various/Dockerfile index 944d9aed319..4de9afdb171 100644 --- a/src/ci/docker/host-x86_64/test-various/Dockerfile +++ b/src/ci/docker/host-x86_64/test-various/Dockerfile @@ -55,9 +55,9 @@ ENV RUST_CONFIGURE_ARGS \ ENV NO_DEBUG_ASSERTIONS=1 ENV NO_OVERFLOW_CHECKS=1 -RUN curl -L https://github.com/bytecodealliance/wasmtime/releases/download/v18.0.2/wasmtime-v18.0.2-x86_64-linux.tar.xz | \ +RUN curl -L https://github.com/bytecodealliance/wasmtime/releases/download/v19.0.0/wasmtime-v19.0.0-x86_64-linux.tar.xz | \ tar -xJ -ENV PATH "$PATH:/wasmtime-v18.0.2-x86_64-linux" +ENV PATH "$PATH:/wasmtime-v19.0.0-x86_64-linux" ENV WASM_TARGETS=wasm32-wasip1 ENV WASM_SCRIPT python3 /checkout/x.py --stage 2 test --host='' --target $WASM_TARGETS \ |