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

Improve locality of error messages & ExampleBuild + Qemu commands, and

Browse source 
indicate failure earlier
This commit is contained in:
datdenkikniet 2023-04-15 22:40:25 +02:00
parent 1c84ccf6e4
commit deeb3877f0
2 changed files with 42 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
xtask/src/cargo_commands.rs
View file

@ -312,30 +312,36 @@ pub fn qemu_run_examples<'c>(
let target = backend.to_target();
let features = Some(target.and_features(backend.to_rtic_feature()));
let build = examples_iter(examples).map(|example| {
let cmd_build = CargoCommand::ExampleBuild {
// We need to be in the correct
cargoarg: &None,
example,
target,
features: features.clone(),
mode: BuildMode::Release,
};
(globals, cmd_build, overwrite)
});
examples_iter(examples)
.flat_map(|example| {
let cmd_build = CargoCommand::ExampleBuild {
cargoarg: &None,
example,
target,
features: features.clone(),
mode: BuildMode::Release,
};
let run = examples_iter(examples).map(|example| {
let cmd_qemu = CargoCommand::Qemu {
cargoarg,
example,
target,
features: features.clone(),
mode: BuildMode::Release,
};
(globals, cmd_qemu, overwrite)
});
let cmd_qemu = CargoCommand::Qemu {
cargoarg,
example,
target,
features: features.clone(),
mode: BuildMode::Release,
};
build.chain(run).run_and_coalesce()
#[cfg(not(feature = "rayon"))]
{
[cmd_build, cmd_qemu].into_iter()
}
#[cfg(feature = "rayon")]
{
[cmd_build, cmd_qemu].into_par_iter()
}
})
.map(|cmd| (globals, cmd, overwrite))
.run_and_coalesce()
}
/// Check the binary sizes of examples

34
xtask/src/command.rs
View file

@ -765,6 +765,10 @@ pub fn run_command(command: &CargoCommand, stderr_mode: OutputMode) -> anyhow::R
log::info!("\n{}", stdout);
}
if !exit_status.success() {
log::error!("❌ Command failed. Run to completion for the summary.");
}
Ok(RunResult {
exit_status,
stdout,
@ -825,32 +829,19 @@ pub fn handle_results(globals: &Globals, results: Vec<FinalRunResult>) -> Result
});
let log_stdout_stderr = |level: Level| {
move |(command, stdout, stderr): (&CargoCommand, &String, &String)| {
move |(cmd, stdout, stderr): (&CargoCommand, &String, &String)| {
let cmd = cmd.as_cmd_string();
if !stdout.is_empty() && !stderr.is_empty() {
log::log!(
level,
"Output for \"{command}\"\nStdout:\n{stdout}\nStderr:\n{stderr}"
);
log::log!(level, "\n{cmd}\nStdout:\n{stdout}\nStderr:\n{stderr}");
} else if !stdout.is_empty() {
log::log!(
level,
"Output for \"{command}\":\nStdout:\n{}",
stdout.trim_end()
);
log::log!(level, "\n{cmd}\nStdout:\n{}", stdout.trim_end());
} else if !stderr.is_empty() {
log::log!(
level,
"Output for \"{command}\"\nStderr:\n{}",
stderr.trim_end()
);
log::log!(level, "\n{cmd}\nStderr:\n{}", stderr.trim_end());
}
}
};
successes.clone().for_each(log_stdout_stderr(Level::Debug));
errors.clone().for_each(log_stdout_stderr(Level::Error));
successes.for_each(|(cmd, _, _)| {
successes.for_each(|(cmd, stdout, stderr)| {
let path = if let Some(dir) = cmd.chdir() {
let path = dir.as_os_str().to_str().unwrap_or("Not displayable");
format!(" (in {path}")
@ -863,15 +854,18 @@ pub fn handle_results(globals: &Globals, results: Vec<FinalRunResult>) -> Result
} else {
info!("✅ Success: {cmd}{path}");
}
log_stdout_stderr(Level::Debug)((cmd, stdout, stderr));
});
errors.clone().for_each(|(cmd, _, _)| {
errors.clone().for_each(|(cmd, stdout, stderr)| {
if let Some(dir) = cmd.chdir() {
let path = dir.as_os_str().to_str().unwrap_or("Not displayable");
error!("❌ Failed: {cmd} (in {path}) \n {}", cmd.as_cmd_string());
} else {
error!("❌ Failed: {cmd}\n {}", cmd.as_cmd_string());
}
log_stdout_stderr(Level::Error)((cmd, stdout, stderr));
});
command_errors