LailaTheElf/actions-rust-cross
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve run-test assertion output

Browse Source
This commit is contained in:
Dave Rolsky 2025-02-16 10:45:23 -06:00
parent 885ad4bc41
commit b094471e7c
No known key found for this signature in database
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
run-tests/src/main.rs
View File

@ -79,7 +79,11 @@ fn check_cross(bin_dir: &Path, expect_cross: bool, expect_cross_version: Option<
let cross_path = bin_dir.join("cross"); let cross_path = bin_dir.join("cross");
if expect_cross { if expect_cross {
assert!(cross_path.is_file(), "`cross` exists"); assert!(
cross_path.is_file(),
"`cross` exists at {}",
cross_path.display()
);
if let Some(expected_version) = expect_cross_version { if let Some(expected_version) = expect_cross_version {
let output = Command::new(&cross_path) let output = Command::new(&cross_path)
@ -90,7 +94,7 @@ fn check_cross(bin_dir: &Path, expect_cross: bool, expect_cross_version: Option<
.expect("`cross --version` stdout was not valid UTF-8"); .expect("`cross --version` stdout was not valid UTF-8");
assert!( assert!(
version.contains(expected_version), version.contains(expected_version),
"`cross` version matches expected version" "`cross` version matches expected version: {expected_version}",
); );
} }
} else { } else {
@ -136,25 +140,29 @@ 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': `{}`",
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': `{}`",
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': `{}`",
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': `{}`",
bin_path.display(), bin_path.display(),
file_output,
); );
} }
} }