Skip to content

Commit

Permalink
Add rustdoc info to jsondocck output
Browse files Browse the repository at this point in the history
  • Loading branch information
CraftSpider committed Feb 1, 2022
1 parent 72e74d7 commit 71249a9
Showing 1 changed file with 12 additions and 5 deletions.
17 changes: 12 additions & 5 deletions src/tools/compiletest/src/runtest.rs
Expand Up @@ -2412,7 +2412,10 @@ impl<'test> TestCx<'test> {
);

if !res.status.success() {
self.fatal_proc_rec("jsondocck failed!", &res)
self.fatal_proc_rec_with_ctx("jsondocck failed!", &res, |_| {
println!("Rustdoc Output:");
proc_res.print_info();
})
}

let mut json_out = out_dir.join(self.testpaths.file.file_stem().unwrap());
Expand Down Expand Up @@ -3759,10 +3762,7 @@ pub struct ProcRes {
}

impl ProcRes {
pub fn fatal(&self, err: Option<&str>, on_failure: impl FnOnce()) -> ! {
if let Some(e) = err {
println!("\nerror: {}", e);
}
pub fn print_info(&self) {
print!(
"\
status: {}\n\
Expand All @@ -3781,6 +3781,13 @@ impl ProcRes {
json::extract_rendered(&self.stdout),
json::extract_rendered(&self.stderr),
);
}

pub fn fatal(&self, err: Option<&str>, on_failure: impl FnOnce()) -> ! {
if let Some(e) = err {
println!("\nerror: {}", e);
}
self.print_info();
on_failure();
// Use resume_unwind instead of panic!() to prevent a panic message + backtrace from
// compiletest, which is unnecessary noise.
Expand Down

0 comments on commit 71249a9

Please sign in to comment.