From 0cd4e349c04812de69d8c96ad85115bc4f6ab50c Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jeremy@system76.com>
Date: Tue, 2 Mar 2021 08:01:26 -0700
Subject: [PATCH] Formatting of tests runner
---
tests/src/main.rs | 19 ++++++-------------
1 file changed, 6 insertions(+), 13 deletions(-)
diff --git a/tests/src/main.rs b/tests/src/main.rs
index 32dd0ad6a..5f85a4f33 100644
--- a/tests/src/main.rs
+++ b/tests/src/main.rs
@@ -1,18 +1,13 @@
use std::{
- env,
- fs,
+ env, fs,
io::{self, Write},
path::PathBuf,
process::{self, Command, ExitStatus},
};
fn expected(bin: &str, kind: &str, generated: &[u8], status: ExitStatus) -> Result<(), String> {
- let mut expected_file = PathBuf::from(format!(
- "expected/{}.{}",
- bin,
- kind
- ));
- if ! expected_file.exists() {
+ let mut expected_file = PathBuf::from(format!("expected/{}.{}", bin, kind));
+ if !expected_file.exists() {
expected_file = PathBuf::from(format!(
"expected/{}.{}",
bin.replace("bins_static", "").replace("bins_dynamic", ""),
@@ -41,9 +36,7 @@ fn expected(bin: &str, kind: &str, generated: &[u8], status: ExitStatus) -> Resu
return Err(format!(
"{} failed - retcode {}, {} mismatch",
- bin,
- status,
- kind
+ bin, status, kind
));
}
@@ -67,7 +60,7 @@ fn main() {
println!("{}", failure);
failures.push(failure);
}
- },
+ }
Err(err) => {
let failure = format!("{}: failed to execute: {}", bin, err);
println!("{}", failure);
@@ -76,7 +69,7 @@ fn main() {
}
}
- if ! failures.is_empty() {
+ if !failures.is_empty() {
println!("# FAILURES #");
for failure in failures {
println!("{}", failure);
--
GitLab