From ec15924a064134565db0876ed83eb88cb2823d58 Mon Sep 17 00:00:00 2001 From: Oliver Middleton Date: Fri, 10 Nov 2017 18:17:03 +0000 Subject: [PATCH] compiletest: Fix a couple of test re-run issues * 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. --- src/tools/compiletest/src/main.rs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/tools/compiletest/src/main.rs b/src/tools/compiletest/src/main.rs index 1701c8a3e43..437031c083a 100644 --- a/src/tools/compiletest/src/main.rs +++ b/src/tools/compiletest/src/main.rs @@ -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) }