mirror/rtic
1
0
Fork 0
mirror of https://github.com/rtic-rs/rtic.git synced 2024-11-29 15:04:32 +01:00
Code Issues Projects Releases Packages Wiki Activity

FIx printing for Run and Qemu

Browse source
This commit is contained in:
datdenkikniet 2023-04-16 11:37:36 +02:00
parent 65f1f4c1b7
commit fd011cd5ec
2 changed files with 50 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
xtask/src/run/mod.rs
View file

@ -24,8 +24,6 @@ use log::{error, info};
#[cfg(feature = "rayon")] #[cfg(feature = "rayon")]
use rayon::prelude::*; use rayon::prelude::*;
use self::results::run_successful;
fn run_and_convert<'a>( fn run_and_convert<'a>(
(global, command, overwrite): (&Globals, CargoCommand<'a>, bool), (global, command, overwrite): (&Globals, CargoCommand<'a>, bool),
) -> FinalRunResult<'a> { ) -> FinalRunResult<'a> {
@ -65,6 +63,42 @@ fn command_parser(
match *command { match *command {
CargoCommand::Qemu { example, .. } | CargoCommand::Run { example, .. } => { CargoCommand::Qemu { example, .. } | CargoCommand::Run { example, .. } => {
/// Check if `run` was successful.
/// returns Ok in case the run went as expected,
/// Err otherwise
pub fn run_successful(
run: &RunResult,
expected_output_file: &str,
) -> Result<(), TestRunError> {
let file = expected_output_file.to_string();
let expected_output = std::fs::read(expected_output_file)
.map(|d| {
String::from_utf8(d)
.map_err(|_| TestRunError::FileError { file: file.clone() })
})
.map_err(|_| TestRunError::FileError { file })??;
let res = if expected_output != run.stdout {
Err(TestRunError::FileCmpError {
expected: expected_output.clone(),
got: run.stdout.clone(),
})
} else if !run.exit_status.success() {
Err(TestRunError::CommandError(run.clone()))
} else {
Ok(())
};
if res.is_ok() {
log::info!("✅ Success.");
} else {
log::error!("❌ Command failed. Run to completion for the summary.");
}
res
}
let run_file = format!("{example}.run"); let run_file = format!("{example}.run");
let expected_output_file = ["rtic", "ci", "expected", &run_file] let expected_output_file = ["rtic", "ci", "expected", &run_file]
.iter() .iter()
@ -74,7 +108,7 @@ fn command_parser(
.map_err(TestRunError::PathConversionError)?; .map_err(TestRunError::PathConversionError)?;
// cargo run <..> // cargo run <..>
let cargo_run_result = run_command(command, output_mode)?; let cargo_run_result = run_command(command, output_mode, false)?;
// Create a file for the expected output if it does not exist or mismatches // Create a file for the expected output if it does not exist or mismatches
if overwrite { if overwrite {
@ -107,7 +141,7 @@ fn command_parser(
| CargoCommand::Test { .. } | CargoCommand::Test { .. }
| CargoCommand::Book { .. } | CargoCommand::Book { .. }
| CargoCommand::ExampleSize { .. } => { | CargoCommand::ExampleSize { .. } => {
let cargo_result = run_command(command, output_mode)?; let cargo_result = run_command(command, output_mode, true)?;
Ok(cargo_result) Ok(cargo_result)
} }
} }
@ -402,7 +436,11 @@ pub fn build_and_check_size<'c>(
runner.run_and_coalesce() runner.run_and_coalesce()
} }
fn run_command(command: &CargoCommand, stderr_mode: OutputMode) -> anyhow::Result<RunResult> { fn run_command(
command: &CargoCommand,
stderr_mode: OutputMode,
print_command_success: bool,
) -> anyhow::Result<RunResult> {
log::info!("👟 {command}"); log::info!("👟 {command}");
let mut process = Command::new(command.executable()); let mut process = Command::new(command.executable());
@ -426,10 +464,12 @@ fn run_command(command: &CargoCommand, stderr_mode: OutputMode) -> anyhow::Resul
log::info!("\n{}", stdout); log::info!("\n{}", stdout);
} }
if exit_status.success() { if print_command_success {
log::info!("✅ Success.") if exit_status.success() {
} else { log::info!("✅ Success.")
log::error!("❌ Command failed. Run to completion for the summary."); } else {
log::error!("❌ Command failed. Run to completion for the summary.");
}
} }
Ok(RunResult { Ok(RunResult {

24
xtask/src/run/results.rs
View file

@ -2,32 +2,10 @@ use log::{error, info, log, Level};
use crate::{argument_parsing::Globals, cargo_command::CargoCommand}; use crate::{argument_parsing::Globals, cargo_command::CargoCommand};
use super::data::{FinalRunResult, RunResult, TestRunError}; use super::data::FinalRunResult;
const TARGET: &str = "xtask::results"; const TARGET: &str = "xtask::results";
/// Check if `run` was successful.
/// returns Ok in case the run went as expected,
/// Err otherwise
pub fn run_successful(run: &RunResult, expected_output_file: &str) -> Result<(), TestRunError> {
let file = expected_output_file.to_string();
let expected_output = std::fs::read(expected_output_file)
.map(|d| String::from_utf8(d).map_err(|_| TestRunError::FileError { file: file.clone() }))
.map_err(|_| TestRunError::FileError { file })??;
if expected_output != run.stdout {
Err(TestRunError::FileCmpError {
expected: expected_output.clone(),
got: run.stdout.clone(),
})
} else if !run.exit_status.success() {
Err(TestRunError::CommandError(run.clone()))
} else {
Ok(())
}
}
pub fn handle_results(globals: &Globals, results: Vec<FinalRunResult>) -> Result<(), ()> { pub fn handle_results(globals: &Globals, results: Vec<FinalRunResult>) -> Result<(), ()> {
let errors = results.iter().filter_map(|r| { let errors = results.iter().filter_map(|r| {
if let FinalRunResult::Failed(c, r) = r { if let FinalRunResult::Failed(c, r) = r {