user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Aliénore Bouttefeux 2021-05-09 14:46:00 +02:00
parent f6b8b78063
commit 4ce2e335d9
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/test/run-make-fulldeps/issue-22131/Makefile
View file

@ -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'

2
src/test/run-make-fulldeps/test-harness/Makefile
View file

@ -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'

2
src/tools/compiletest/src/runtest.rs
View file

@ -2638,7 +2638,7 @@ impl<'test> TestCx<'test> {
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;