Skip to content

Commit 49e4c8d

Browse files
committed
Stop ignoring the --manifest-path
1 parent 641927f commit 49e4c8d

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

src/tools/miri/miri

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@ run|run-dep)
330330
# Then run the actual command.
331331

332332
if [ "$COMMAND" = "run-dep" ]; then
333-
exec $CARGO test --test compiletest -- miri-run-dep-mode $CARGO_EXTRA_FLAGS --manifest-path "$MIRIDIR"/Cargo.toml -- $MIRIFLAGS "$@"
333+
exec $CARGO test --test compiletest $CARGO_EXTRA_FLAGS --manifest-path "$MIRIDIR"/Cargo.toml -- --miri-run-dep-mode $MIRIFLAGS "$@"
334334
else
335335
exec $CARGO run $CARGO_EXTRA_FLAGS --manifest-path "$MIRIDIR"/Cargo.toml -- $MIRIFLAGS "$@"
336336
fi

src/tools/miri/tests/compiletest.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ fn main() -> Result<()> {
242242
let target = get_target();
243243

244244
if let Some(first) = std::env::args().nth(1) {
245-
if first == "miri-run-dep-mode" {
245+
if first == "--miri-run-dep-mode" {
246246
return run_dep_mode(target);
247247
}
248248
}
@@ -270,7 +270,7 @@ fn main() -> Result<()> {
270270
}
271271

272272
fn run_dep_mode(target: String) -> Result<()> {
273-
let files = std::env::args().skip_while(|arg| arg != "--").skip(1);
273+
let files = std::env::args().skip(2);
274274
for path in files {
275275
let mut config = run_test_config(std::iter::empty(), &target, &path, Mode::Yolo, true);
276276
config.program.args.remove(0); // remove the `--error-format=json` argument

0 commit comments

Comments
 (0)