squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

compiletest: Fix a couple of test re-run issues

Browse source 
* Re-run rustdoc tests if rustdoc or htmldocck.py was updated.
* Put stamp files in the correct subdirectories to avoid clashes when
the file names match but the subdirectory doesn't.
This commit is contained in:
Oliver Middleton 2017-11-10 18:17:03 +00:00
parent d5ff0e6422
commit ec15924a06
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/tools/compiletest/src/main.rs
View file

@ -491,6 +491,7 @@ fn stamp(config: &Config, testpaths: &TestPaths) -> PathBuf {
config.stage_id);
config.build_base.canonicalize()
.unwrap_or_else(|_| config.build_base.clone())
.join(&testpaths.relative_dir)
.join(stamp_name)
}
@ -522,6 +523,10 @@ fn up_to_date(config: &Config, testpaths: &TestPaths, props: &EarlyProps) -> boo
let lib = lib.unwrap();
inputs.push(mtime(&lib.path()));
}
if let Some(ref rustdoc_path) = config.rustdoc_path {
inputs.push(mtime(&rustdoc_path));
inputs.push(mtime(&rust_src_dir.join("src/etc/htmldocck.py")));
}
inputs.iter().any(|input| *input > stamp)
}