Skip to content

Commit af88ce5

Browse files
committed
allow aux builds in rustdoc-ui mode
1 parent 25687ca commit af88ce5

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

src/tools/compiletest/src/common.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ impl fmt::Display for Debugger {
169169
}
170170

171171
/// Configuration for compiletest
172-
#[derive(Clone)]
172+
#[derive(Debug, Clone)]
173173
pub struct Config {
174174
/// `true` to to overwrite stderr/stdout files instead of complaining about changes in output.
175175
pub bless: bool,

src/tools/compiletest/src/runtest.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -1877,7 +1877,8 @@ impl<'test> TestCx<'test> {
18771877
emit_metadata: EmitMetadata,
18781878
allow_unused: AllowUnused,
18791879
) -> Command {
1880-
let is_rustdoc = self.is_rustdoc();
1880+
let is_aux = input_file.components().map(|c| c.as_os_str()).any(|c| c == "auxiliary");
1881+
let is_rustdoc = self.is_rustdoc() && !is_aux;
18811882
let mut rustc = if !is_rustdoc {
18821883
Command::new(&self.config.rustc_path)
18831884
} else {
@@ -3502,6 +3503,7 @@ impl ProcRes {
35023503
}
35033504
}
35043505

3506+
#[derive(Debug)]
35053507
enum TargetLocation {
35063508
ThisFile(PathBuf),
35073509
ThisDirectory(PathBuf),

0 commit comments

Comments
 (0)