mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #93508 - CraftSpider:jsondocck-runtest-output, r=Mark-Simulacrum

Browse Source 
Add rustdoc info to jsondocck output

Makes debugging issues in the generated output simpler by handling emitted logs and etc.
This commit is contained in:
Matthias Krüger 2022-02-04 14:58:59 +01:00 committed by GitHub
commit c77f0a42d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/tools/compiletest/src/runtest.rs
View File

@ -2424,7 +2424,10 @@ fn run_rustdoc_json_test(&self) {
); );
if !res.status.success() { 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()); let mut json_out = out_dir.join(self.testpaths.file.file_stem().unwrap());
@ -3738,10 +3741,7 @@ pub struct ProcRes {
} }
impl ProcRes { impl ProcRes {
pub fn fatal(&self, err: Option<&str>, on_failure: impl FnOnce()) -> ! { pub fn print_info(&self) {
if let Some(e) = err {
println!("\nerror: {}", e);
}
print!( print!(
"\ "\
status: {}\n\ status: {}\n\
@ -3760,6 +3760,13 @@ pub fn fatal(&self, err: Option<&str>, on_failure: impl FnOnce()) -> ! {
json::extract_rendered(&self.stdout), json::extract_rendered(&self.stdout),
json::extract_rendered(&self.stderr), 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(); on_failure();
// Use resume_unwind instead of panic!() to prevent a panic message + backtrace from // Use resume_unwind instead of panic!() to prevent a panic message + backtrace from
// compiletest, which is unnecessary noise. // compiletest, which is unnecessary noise.