Always print output file in test code
This commit is contained in:
parent
329eb5fa43
commit
ddb18cfff9
@ -122,12 +122,16 @@ fn check_binary(bin_path: &PathBuf, expect_file_re: Option<&str>, expect_strippe
|
|||||||
.output()
|
.output()
|
||||||
.expect("Failed to execute `file` command");
|
.expect("Failed to execute `file` command");
|
||||||
let file_output = String::from_utf8_lossy(&output.stdout);
|
let file_output = String::from_utf8_lossy(&output.stdout);
|
||||||
|
println!(
|
||||||
|
"output from `file` for {}: {file_output}",
|
||||||
|
bin_path.display(),
|
||||||
|
);
|
||||||
|
|
||||||
if let Some(file_re) = expect_file_re {
|
if let Some(file_re) = expect_file_re {
|
||||||
let re = Regex::new(file_re).expect("Invalid regex");
|
let re = Regex::new(file_re).expect("Invalid regex");
|
||||||
assert!(
|
assert!(
|
||||||
re.is_match(&file_output),
|
re.is_match(&file_output),
|
||||||
"`file` output for {} matches `{file_re}`",
|
"`file` output for {} matches `{file_re}`: `{file_output}`",
|
||||||
bin_path.display(),
|
bin_path.display(),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@ -140,29 +144,25 @@ fn check_binary(bin_path: &PathBuf, expect_file_re: Option<&str>, expect_strippe
|
|||||||
if expect_stripped {
|
if expect_stripped {
|
||||||
assert!(
|
assert!(
|
||||||
!file_output.contains("not stripped"),
|
!file_output.contains("not stripped"),
|
||||||
"`file` does not report {} as 'not stripped': `{}`",
|
"`file` does not report {} as 'not stripped': `{file_output}`",
|
||||||
bin_path.display(),
|
bin_path.display(),
|
||||||
file_output,
|
|
||||||
);
|
);
|
||||||
assert!(
|
assert!(
|
||||||
file_output.contains("stripped"),
|
file_output.contains("stripped"),
|
||||||
"`file` reports {} as 'stripped': `{}`",
|
"`file` reports {} as 'stripped': `{file_output}`",
|
||||||
bin_path.display(),
|
bin_path.display(),
|
||||||
file_output,
|
|
||||||
);
|
);
|
||||||
} else if cfg!(windows) {
|
} else if cfg!(windows) {
|
||||||
assert!(
|
assert!(
|
||||||
!file_output.contains("stripped"),
|
!file_output.contains("stripped"),
|
||||||
"`file` does not report {} as 'stripped': `{}`",
|
"`file` does not report {} as 'stripped': `{file_output}`",
|
||||||
bin_path.display(),
|
bin_path.display(),
|
||||||
file_output,
|
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
assert!(
|
assert!(
|
||||||
file_output.contains("not stripped"),
|
file_output.contains("not stripped"),
|
||||||
"`file` reports {} as 'not stripped': `{}`",
|
"`file` reports {} as 'not stripped': `{file_output}`",
|
||||||
bin_path.display(),
|
bin_path.display(),
|
||||||
file_output,
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user