Don't show HTML diff if tidy isn't installed for rustdoc tests
This commit is contained in:
parent
4b9f5cc4c1
commit
ee98c6fea4
2 changed files with 6 additions and 5 deletions
|
@ -44,7 +44,7 @@ fn main() {
|
|||
}
|
||||
|
||||
if !config.has_tidy && config.mode == Mode::Rustdoc {
|
||||
eprintln!("warning: `tidy` is not installed; generated diffs will be harder to read");
|
||||
eprintln!("warning: `tidy` is not installed; diffs will not be generated");
|
||||
}
|
||||
|
||||
log_config(&config);
|
||||
|
|
|
@ -2365,6 +2365,9 @@ impl<'test> TestCx<'test> {
|
|||
}
|
||||
|
||||
fn compare_to_default_rustdoc(&mut self, out_dir: &Path) {
|
||||
if !self.config.has_tidy {
|
||||
return;
|
||||
}
|
||||
println!("info: generating a diff against nightly rustdoc");
|
||||
|
||||
let suffix =
|
||||
|
@ -2426,10 +2429,8 @@ impl<'test> TestCx<'test> {
|
|||
}
|
||||
}
|
||||
};
|
||||
if self.config.has_tidy {
|
||||
tidy_dir(out_dir);
|
||||
tidy_dir(&compare_dir);
|
||||
}
|
||||
tidy_dir(out_dir);
|
||||
tidy_dir(&compare_dir);
|
||||
|
||||
let pager = {
|
||||
let output = Command::new("git").args(&["config", "--get", "core.pager"]).output().ok();
|
||||
|
|
Loading…
Reference in a new issue