diff options
| author | bors <bors@rust-lang.org> | 2023-12-10 17:23:55 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-12-10 17:23:55 +0000 |
| commit | 7d0994ca2d22379d5c876fa212c243307464efcd (patch) | |
| tree | e4508b4993fbebc88aadd6e480472ae7fdddb70e | |
| parent | 92ab9d65bb8f3a1b167c2ccb9d22de301a7aef45 (diff) | |
| parent | 890785826a0112f111fb1cdbd1498abaf0c77b49 (diff) | |
| download | rust-7d0994ca2d22379d5c876fa212c243307464efcd.tar.gz rust-7d0994ca2d22379d5c876fa212c243307464efcd.zip | |
Auto merge of #3199 - Jefffrey:fix-doc-and-script, r=RalfJung
Fix miri script target dir and update doc link Fix ui_test doc link in `CONTRIBUTING.md` Explicitly set `--target-dir` in `miri` script when building to expected location - I have `build.target-dir` cargo config set to be some other location so miri script was erroring out since compiled binary was not in expected location
| -rw-r--r-- | src/tools/miri/CONTRIBUTING.md | 2 | ||||
| -rwxr-xr-x | src/tools/miri/miri | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/tools/miri/CONTRIBUTING.md b/src/tools/miri/CONTRIBUTING.md index 40a4332cdb9..7a49ff3372f 100644 --- a/src/tools/miri/CONTRIBUTING.md +++ b/src/tools/miri/CONTRIBUTING.md @@ -109,7 +109,7 @@ to run the other checks while ignoring the ui output, use `MIRI_SKIP_UI_CHECKS=1 For more info on how to configure ui tests see [the documentation on the ui test crate][ui_test] -[ui_test]: ui_test/README.md +[ui_test]: https://github.com/oli-obk/ui_test/blob/main/README.md ### Testing `cargo miri` diff --git a/src/tools/miri/miri b/src/tools/miri/miri index e21738c3618..169f4521f2d 100755 --- a/src/tools/miri/miri +++ b/src/tools/miri/miri @@ -2,5 +2,6 @@ set -e # Instead of doing just `cargo run --manifest-path .. $@`, we invoke miri-script binary directly. Invoking `cargo run` goes through # rustup (that sets it's own environmental variables), which is undesirable. -cargo build $CARGO_EXTRA_FLAGS -q --manifest-path "$(dirname "$0")"/miri-script/Cargo.toml -"$(dirname "$0")"/miri-script/target/debug/miri-script "$@" +MIRI_SCRIPT_TARGET_DIR="$(dirname "$0")"/miri-script/target +cargo build $CARGO_EXTRA_FLAGS -q --target-dir "$MIRI_SCRIPT_TARGET_DIR" --manifest-path "$(dirname "$0")"/miri-script/Cargo.toml +"$MIRI_SCRIPT_TARGET_DIR"/debug/miri-script "$@" |