File tree Expand file tree Collapse file tree 2 files changed +15
-4
lines changed Expand file tree Collapse file tree 2 files changed +15
-4
lines changed Original file line number Diff line number Diff line change @@ -111,6 +111,7 @@ RUN rm src/*.rs
111
111
COPY --from=build-orchestrator /playground/.cargo/bin/worker /playground/.cargo/bin/worker
112
112
COPY --from=wasm-tools /playground/.cargo/bin/wasm-tools /playground/.cargo/bin
113
113
COPY --chown=playground cargo-wasm /playground/.cargo/bin
114
+ # `cargo-miri-playground` is vestigial and can be removed after a while
114
115
COPY --chown=playground cargo-miri-playground /playground/.cargo/bin
115
116
116
117
ENTRYPOINT ["/playground/tools/entrypoint.sh" ]
Original file line number Diff line number Diff line change @@ -688,12 +688,23 @@ impl LowerRequest for MiriRequest {
688
688
miriflags. push ( "-Zmiri-tree-borrows" ) ;
689
689
}
690
690
691
+ miriflags. push ( "-Zmiri-disable-isolation" ) ;
692
+
691
693
let miriflags = miriflags. join ( " " ) ;
692
694
693
695
ExecuteCommandRequest {
694
696
cmd : "cargo" . to_owned ( ) ,
695
- args : vec ! [ "miri-playground" . to_owned( ) ] ,
696
- envs : kvs ! ( "MIRIFLAGS" => miriflags) . collect ( ) ,
697
+ args : [ "miri" , "run" ] . map ( Into :: into) . into ( ) ,
698
+ envs : kvs ! {
699
+ "MIRIFLAGS" => miriflags,
700
+ // Be sure that `cargo miri` will not build a new
701
+ // sysroot. Creating a sysroot takes a while and Miri
702
+ // will build one by default if it's missing. If
703
+ // `MIRI_SYSROOT` is set and the sysroot is missing,
704
+ // it will error instead.
705
+ "MIRI_SYSROOT" => "/playground/.cache/miri" ,
706
+ }
707
+ . collect ( ) ,
697
708
cwd : None ,
698
709
}
699
710
}
@@ -3971,8 +3982,7 @@ mod tests {
3971
3982
#[ tokio:: test]
3972
3983
#[ snafu:: report]
3973
3984
async fn miri ( ) -> Result < ( ) > {
3974
- // cargo-miri-playground only exists inside the container
3975
- let coordinator = new_coordinator_docker ( ) ;
3985
+ let coordinator = new_coordinator ( ) ;
3976
3986
3977
3987
let req = MiriRequest {
3978
3988
code : r#"
You can’t perform that action at this time.
0 commit comments