Skip to content

Commit 7d0994c

Browse files
committed
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
2 parents 92ab9d6 + 8907858 commit 7d0994c

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

src/tools/miri/CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ to run the other checks while ignoring the ui output, use `MIRI_SKIP_UI_CHECKS=1
109109

110110
For more info on how to configure ui tests see [the documentation on the ui test crate][ui_test]
111111

112-
[ui_test]: ui_test/README.md
112+
[ui_test]: https://github.com/oli-obk/ui_test/blob/main/README.md
113113

114114
### Testing `cargo miri`
115115

src/tools/miri/miri

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@
22
set -e
33
# Instead of doing just `cargo run --manifest-path .. $@`, we invoke miri-script binary directly. Invoking `cargo run` goes through
44
# rustup (that sets it's own environmental variables), which is undesirable.
5-
cargo build $CARGO_EXTRA_FLAGS -q --manifest-path "$(dirname "$0")"/miri-script/Cargo.toml
6-
"$(dirname "$0")"/miri-script/target/debug/miri-script "$@"
5+
MIRI_SCRIPT_TARGET_DIR="$(dirname "$0")"/miri-script/target
6+
cargo build $CARGO_EXTRA_FLAGS -q --target-dir "$MIRI_SCRIPT_TARGET_DIR" --manifest-path "$(dirname "$0")"/miri-script/Cargo.toml
7+
"$MIRI_SCRIPT_TARGET_DIR"/debug/miri-script "$@"

0 commit comments

Comments
 (0)