Skip to content

Commit 29bc4bd

Browse files
committed
Skip our miri-playground wrapper script
1 parent 9ad81cb commit 29bc4bd

File tree

2 files changed

+14
-4
lines changed

2 files changed

+14
-4
lines changed

compiler/base/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ RUN rm src/*.rs
111111
COPY --from=build-orchestrator /playground/.cargo/bin/worker /playground/.cargo/bin/worker
112112
COPY --from=wasm-tools /playground/.cargo/bin/wasm-tools /playground/.cargo/bin
113113
COPY --chown=playground cargo-wasm /playground/.cargo/bin
114+
# `cargo-miri-playground` is vestigial and can be removed after a while
114115
COPY --chown=playground cargo-miri-playground /playground/.cargo/bin
115116

116117
ENTRYPOINT ["/playground/tools/entrypoint.sh"]

compiler/base/orchestrator/src/coordinator.rs

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -680,12 +680,22 @@ impl LowerRequest for MiriRequest {
680680
miriflags.push("-Zmiri-tree-borrows");
681681
}
682682

683+
miriflags.push("-Zmiri-disable-isolation");
684+
683685
let miriflags = miriflags.join(" ");
684686

685687
ExecuteCommandRequest {
686688
cmd: "cargo".to_owned(),
687-
args: vec!["miri-playground".to_owned()],
688-
envs: HashMap::from_iter([("MIRIFLAGS".to_owned(), miriflags)]),
689+
args: ["miri", "run"].map(Into::into).into(),
690+
envs: HashMap::from_iter([
691+
("MIRIFLAGS".to_owned(), miriflags),
692+
// Be sure that `cargo miri` will not build a new
693+
// sysroot. Creating a sysroot takes a while and Miri
694+
// will build one by default if it's missing. If
695+
// `MIRI_SYSROOT` is set and the sysroot is missing,
696+
// it will error instead.
697+
("MIRI_SYSROOT".to_owned(), "/playground/.cache/miri".to_owned()),
698+
]),
689699
cwd: None,
690700
}
691701
}
@@ -3963,8 +3973,7 @@ mod tests {
39633973
#[tokio::test]
39643974
#[snafu::report]
39653975
async fn miri() -> Result<()> {
3966-
// cargo-miri-playground only exists inside the container
3967-
let coordinator = new_coordinator_docker();
3976+
let coordinator = new_coordinator();
39683977

39693978
let req = MiriRequest {
39703979
code: r#"

0 commit comments

Comments
 (0)