Skip to content

Commit 4ce2e33

Browse files
committed
fix compiletest to search for two dash and run make fulldeps test
1 parent f6b8b78 commit 4ce2e33

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

src/test/run-make-fulldeps/issue-22131/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ all: foo.rs
44
$(RUSTC) --cfg 'feature="bar"' --crate-type lib foo.rs
55
$(RUSTDOC) --test --cfg 'feature="bar"' \
66
-L $(TMPDIR) foo.rs |\
7-
$(CGREP) 'foo.rs - foo (line 1) ... ok'
7+
$(CGREP) 'foo.rs - foo (line 1) - run ... ok'

src/test/run-make-fulldeps/test-harness/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
all:
44
# check that #[cfg_attr(..., ignore)] does the right thing.
55
$(RUSTC) --test test-ignore-cfg.rs --cfg ignorecfg
6-
$(call RUN,test-ignore-cfg) | $(CGREP) 'shouldnotignore ... ok' 'shouldignore ... ignored'
6+
$(call RUN,test-ignore-cfg) | $(CGREP) 'shouldnotignore - run ... ok' 'shouldignore - ignore ... ignored'
77
$(call RUN,test-ignore-cfg --quiet) | $(CGREP) -e "^i\.$$"
88
$(call RUN,test-ignore-cfg --quiet) | $(CGREP) -v 'should'

src/tools/compiletest/src/runtest.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2638,7 +2638,7 @@ impl<'test> TestCx<'test> {
26382638
let mut tested = 0;
26392639
for _ in res.stdout.split('\n').filter(|s| s.starts_with("test ")).inspect(|s| {
26402640
let tmp: Vec<&str> = s.split(" - ").collect();
2641-
if tmp.len() == 2 {
2641+
if tmp.len() == 3 {
26422642
let path = tmp[0].rsplit("test ").next().unwrap();
26432643
if let Some(ref mut v) = files.get_mut(&path.replace('\\', "/")) {
26442644
tested += 1;

0 commit comments

Comments
 (0)