user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

allow aux builds in rustdoc-ui mode

Browse source
This commit is contained in:
Andy Russell 2020-06-28 13:06:15 -04:00
parent 25687caa2e
commit af88ce5eb3
No known key found for this signature in database
GPG key ID: BE2221033EDBC374
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/tools/compiletest/src/common.rs
View file

@ -169,7 +169,7 @@ impl fmt::Display for Debugger {
}
/// Configuration for compiletest
#[derive(Clone)]
#[derive(Debug, Clone)]
pub struct Config {
/// `true` to to overwrite stderr/stdout files instead of complaining about changes in output.
pub bless: bool,

4
src/tools/compiletest/src/runtest.rs
View file

@ -1877,7 +1877,8 @@ impl<'test> TestCx<'test> {
emit_metadata: EmitMetadata,
allow_unused: AllowUnused,
) -> Command {
let is_rustdoc = self.is_rustdoc();
let is_aux = input_file.components().map(|c| c.as_os_str()).any(|c| c == "auxiliary");
let is_rustdoc = self.is_rustdoc() && !is_aux;
let mut rustc = if !is_rustdoc {
Command::new(&self.config.rustc_path)
} else {
@ -3502,6 +3503,7 @@ impl ProcRes {
}
}
#[derive(Debug)]
enum TargetLocation {
ThisFile(PathBuf),
ThisDirectory(PathBuf),