mathieu/os-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Stop ignoring the --manifest-path

Browse source
This commit is contained in:
Oli Scherer 2023-05-11 16:40:42 +00:00
parent 641927f748
commit 49e4c8dc0d
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/tools/miri/miri
View file

@ -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

4
src/tools/miri/tests/compiletest.rs
View file

@ -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