Skip to content

Commit 6a67a34

Browse files
committed
move and update test dependencies
1 parent 6ce164d commit 6a67a34

File tree

6 files changed

+169
-76
lines changed

6 files changed

+169
-76
lines changed

src/tools/miri/cargo-miri/src/util.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,8 @@ pub fn exec(mut cmd: Command) -> ! {
129129
// On non-Unix imitate POSIX exec as closely as we can
130130
#[cfg(not(unix))]
131131
{
132-
let exit_status = cmd.status().expect("failed to run command");
132+
let exit_status =
133+
cmd.status().unwrap_or_else(|err| panic!("failed to run `{cmd:?}`:\n{err}"));
133134
std::process::exit(exit_status.code().unwrap_or(-1))
134135
}
135136
// On Unix targets, actually exec.
@@ -138,8 +139,8 @@ pub fn exec(mut cmd: Command) -> ! {
138139
#[cfg(unix)]
139140
{
140141
use std::os::unix::process::CommandExt;
141-
let error = cmd.exec();
142-
panic!("failed to run command: {error}")
142+
let err = cmd.exec();
143+
panic!("failed to run `{cmd:?}`:\n{err}")
143144
}
144145
}
145146

src/tools/miri/miri-script/src/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ pub enum Command {
7575
///
7676
/// Also respects MIRIFLAGS environment variable.
7777
Run {
78-
/// Build the program with the dependencies declared in `test_dependencies/Cargo.toml`.
78+
/// Build the program with the dependencies declared in `tests/deps/Cargo.toml`.
7979
#[arg(long)]
8080
dep: bool,
8181
/// Show build progress.

0 commit comments

Comments
 (0)