diff options
| author | Oli Scherer <git-spam-no-reply9815368754983@oli-obk.de> | 2023-05-11 16:40:42 +0000 |
|---|---|---|
| committer | Oli Scherer <git-spam-no-reply9815368754983@oli-obk.de> | 2023-05-11 16:40:42 +0000 |
| commit | 49e4c8dc0de9bbe9815b0d255c11b0ad8a90392a (patch) | |
| tree | 4a65b5283c36b5a2a66c98b935e43e9a2a40cf04 | |
| parent | 641927f748918be4679582acd72b69ae3fa53af2 (diff) | |
| download | rust-49e4c8dc0de9bbe9815b0d255c11b0ad8a90392a.tar.gz rust-49e4c8dc0de9bbe9815b0d255c11b0ad8a90392a.zip | |
Stop ignoring the `--manifest-path`
| -rwxr-xr-x | src/tools/miri/miri | 2 | ||||
| -rw-r--r-- | src/tools/miri/tests/compiletest.rs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/tools/miri/miri b/src/tools/miri/miri index 9e33f525c8f..48a46a76a12 100755 --- a/src/tools/miri/miri +++ b/src/tools/miri/miri @@ -330,7 +330,7 @@ run|run-dep) # Then run the actual command. if [ "$COMMAND" = "run-dep" ]; then - exec $CARGO test --test compiletest -- miri-run-dep-mode $CARGO_EXTRA_FLAGS --manifest-path "$MIRIDIR"/Cargo.toml -- $MIRIFLAGS "$@" + exec $CARGO test --test compiletest $CARGO_EXTRA_FLAGS --manifest-path "$MIRIDIR"/Cargo.toml -- --miri-run-dep-mode $MIRIFLAGS "$@" else exec $CARGO run $CARGO_EXTRA_FLAGS --manifest-path "$MIRIDIR"/Cargo.toml -- $MIRIFLAGS "$@" fi diff --git a/src/tools/miri/tests/compiletest.rs b/src/tools/miri/tests/compiletest.rs index 688b6519cbd..c027c7a7779 100644 --- a/src/tools/miri/tests/compiletest.rs +++ b/src/tools/miri/tests/compiletest.rs @@ -242,7 +242,7 @@ fn main() -> Result<()> { let target = get_target(); if let Some(first) = std::env::args().nth(1) { - if first == "miri-run-dep-mode" { + if first == "--miri-run-dep-mode" { return run_dep_mode(target); } } @@ -270,7 +270,7 @@ fn main() -> Result<()> { } fn run_dep_mode(target: String) -> Result<()> { - let files = std::env::args().skip_while(|arg| arg != "--").skip(1); + let files = std::env::args().skip(2); for path in files { let mut config = run_test_config(std::iter::empty(), &target, &path, Mode::Yolo, true); config.program.args.remove(0); // remove the `--error-format=json` argument |