fix compiletest to search for two dash and run make fulldeps test

diff --git a/src/test/run-make-fulldeps/issue-22131/Makefile b/src/test/run-make-fulldeps/issue-22131/Makefile
index d76aaf5c146db9f091e77539271fe1be4209f36c..5f721ef3130576e00600c93767dfc94376713850 100644 (file)
--- a/src/test/run-make-fulldeps/issue-22131/Makefile
+++ b/src/test/run-make-fulldeps/issue-22131/Makefile
@@ -4,4 +4,4 @@ all: foo.rs
        $(RUSTC) --cfg 'feature="bar"' --crate-type lib foo.rs
        $(RUSTDOC) --test --cfg 'feature="bar"' \
                -L $(TMPDIR) foo.rs |\
-               $(CGREP) 'foo.rs - foo (line 1) ... ok'
+               $(CGREP) 'foo.rs - foo (line 1) - run ... ok'

diff --git a/src/test/run-make-fulldeps/test-harness/Makefile b/src/test/run-make-fulldeps/test-harness/Makefile
index 39477c07ced7cbca048f41fb611ae52555d2ffd6..1f3b112d6afe443a1e5bedeb3761ec5d3db3f622 100644 (file)
--- a/src/test/run-make-fulldeps/test-harness/Makefile
+++ b/src/test/run-make-fulldeps/test-harness/Makefile
@@ -3,6 +3,6 @@
 all:
        # check that #[cfg_attr(..., ignore)] does the right thing.
        $(RUSTC) --test test-ignore-cfg.rs --cfg ignorecfg
-       $(call RUN,test-ignore-cfg) | $(CGREP) 'shouldnotignore ... ok' 'shouldignore ... ignored'
+       $(call RUN,test-ignore-cfg) | $(CGREP) 'shouldnotignore - run ... ok' 'shouldignore - ignore ... ignored'
        $(call RUN,test-ignore-cfg --quiet) | $(CGREP) -e "^i\.$$"
        $(call RUN,test-ignore-cfg --quiet) | $(CGREP) -v 'should'

diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs
index ecbaccf744dcdd3d61b41b25b6ed82d66c282022..0898e9ef2f63017e9cc4e1d639171a2a21f010c9 100644 (file)
--- a/src/tools/compiletest/src/runtest.rs
+++ b/src/tools/compiletest/src/runtest.rs
@@ -2638,7 +2638,7 @@ fn check_rustdoc_test_option(&self, res: ProcRes) {
         let mut tested = 0;
         for _ in res.stdout.split('\n').filter(|s| s.starts_with("test ")).inspect(|s| {
             let tmp: Vec<&str> = s.split(" - ").collect();
-            if tmp.len() == 2 {
+            if tmp.len() == 3 {
                 let path = tmp[0].rsplit("test ").next().unwrap();
                 if let Some(ref mut v) = files.get_mut(&path.replace('\\', "/")) {
                     tested += 1;