remove mode for run and ignore tests

ABouttefeux · ABouttefeux · commit 3d8180635289 · 2021-05-16T22:33:41.000+02:00
diff --git a/library/test/src/formatters/pretty.rs b/library/test/src/formatters/pretty.rs
@@ -169,7 +169,12 @@ impl<T: Write> PrettyFormatter<T> {
 
     fn write_test_name(&mut self, desc: &TestDesc) -> io::Result<()> {
         let name = desc.padded_name(self.max_name_len, desc.name.padding());
-        self.write_plain(&format!("test {} - {} ... ", name, desc.test_mode()))?;
+        let test_mode = desc.test_mode();
+        if test_mode == "" {
+            self.write_plain(&format!("test {} ... ", name))?;
+        } else {
+            self.write_plain(&format!("test {} - {} ... ", name, test_mode))?;
+        }
 
         Ok(())
     }
diff --git a/library/test/src/formatters/terse.rs b/library/test/src/formatters/terse.rs
@@ -158,7 +158,12 @@ impl<T: Write> TerseFormatter<T> {
 
     fn write_test_name(&mut self, desc: &TestDesc) -> io::Result<()> {
         let name = desc.padded_name(self.max_name_len, desc.name.padding());
-        self.write_plain(&format!("test {} - {} ... ", name, desc.test_mode()))?;
+        let test_mode = desc.test_mode();
+        if test_mode == "" {
+            self.write_plain(&format!("test {} ... ", name))?;
+        } else {
+            self.write_plain(&format!("test {} - {} ... ", name, test_mode))?;
+        }
 
         Ok(())
     }
diff --git a/library/test/src/types.rs b/library/test/src/types.rs
@@ -148,7 +148,7 @@ impl TestDesc {
     #[cfg(not(bootstrap))]
     pub fn test_mode(&self) -> &'static str {
         if self.ignore {
-            return &"ignore";
+            return &"";
         }
         match self.should_panic {
             options::ShouldPanic::Yes | options::ShouldPanic::YesWithMessage(_) => {
@@ -165,7 +165,7 @@ impl TestDesc {
         if self.no_run {
             return &"compile";
         }
-        &"run"
+        &""
     }
 
     #[cfg(bootstrap)]
diff --git 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) - run ... ok'
+		$(CGREP) 'foo.rs - foo (line 1) ... ok'
diff --git 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 - run ... ok' 'shouldignore - ignore ... ignored'
+	$(call RUN,test-ignore-cfg) | $(CGREP) 'shouldnotignore ... ok' 'shouldignore ... ignored'
 	$(call RUN,test-ignore-cfg --quiet) | $(CGREP) -e "^i\.$$"
 	$(call RUN,test-ignore-cfg --quiet) | $(CGREP) -v 'should'
diff --git a/src/test/rustdoc-ui/cfg-test.stdout b/src/test/rustdoc-ui/cfg-test.stdout
@@ -1,7 +1,7 @@
 
 running 2 tests
-test $DIR/cfg-test.rs - Bar (line 27) - run ... ok
-test $DIR/cfg-test.rs - Foo (line 19) - run ... ok
+test $DIR/cfg-test.rs - Bar (line 27) ... ok
+test $DIR/cfg-test.rs - Foo (line 19) ... ok
 
 test result: ok. 2 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
 
diff --git a/src/test/rustdoc-ui/doc-test-doctest-feature.stdout b/src/test/rustdoc-ui/doc-test-doctest-feature.stdout
@@ -1,6 +1,6 @@
 
 running 1 test
-test $DIR/doc-test-doctest-feature.rs - Foo (line 9) - run ... ok
+test $DIR/doc-test-doctest-feature.rs - Foo (line 9) ... ok
 
 test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
 
diff --git a/src/test/rustdoc-ui/doc-test-rustdoc-feature.stdout b/src/test/rustdoc-ui/doc-test-rustdoc-feature.stdout
@@ -1,6 +1,6 @@
 
 running 1 test
-test $DIR/doc-test-rustdoc-feature.rs - Foo (line 10) - run ... ok
+test $DIR/doc-test-rustdoc-feature.rs - Foo (line 10) ... ok
 
 test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
 
diff --git a/src/test/rustdoc-ui/doctest-output.stdout b/src/test/rustdoc-ui/doctest-output.stdout
@@ -1,8 +1,8 @@
 
 running 3 tests
-test $DIR/doctest-output.rs - (line 8) - run ... ok
-test $DIR/doctest-output.rs - ExpandedStruct (line 24) - run ... ok
-test $DIR/doctest-output.rs - foo::bar (line 18) - run ... ok
+test $DIR/doctest-output.rs - (line 8) ... ok
+test $DIR/doctest-output.rs - ExpandedStruct (line 24) ... ok
+test $DIR/doctest-output.rs - foo::bar (line 18) ... ok
 
 test result: ok. 3 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
 
diff --git a/src/test/rustdoc-ui/failed-doctest-output.stdout b/src/test/rustdoc-ui/failed-doctest-output.stdout
@@ -1,7 +1,7 @@
 
 running 2 tests
-test $DIR/failed-doctest-output.rs - OtherStruct (line 22) - run ... FAILED
-test $DIR/failed-doctest-output.rs - SomeStruct (line 12) - run ... FAILED
+test $DIR/failed-doctest-output.rs - OtherStruct (line 22) ... FAILED
+test $DIR/failed-doctest-output.rs - SomeStruct (line 12) ... FAILED
 
 failures:
 
diff --git a/src/test/rustdoc-ui/failed-doctest-should-panic.stdout b/src/test/rustdoc-ui/failed-doctest-should-panic.stdout
@@ -1,6 +1,6 @@
 
 running 1 test
-test $DIR/failed-doctest-should-panic.rs - Foo (line 9) - run ... FAILED
+test $DIR/failed-doctest-should-panic.rs - Foo (line 9) ... FAILED
 
 failures:
 
diff --git a/src/test/rustdoc-ui/issue-81662-shortness.stdout b/src/test/rustdoc-ui/issue-81662-shortness.stdout
@@ -1,6 +1,6 @@
 
 running 1 test
-test $DIR/issue-81662-shortness.rs - foo (line 6) - run ... FAILED
+test $DIR/issue-81662-shortness.rs - foo (line 6) ... FAILED
 
 failures:
 
diff --git a/src/test/rustdoc-ui/no-run-flag.stdout b/src/test/rustdoc-ui/no-run-flag.stdout
@@ -1,7 +1,7 @@
 
 running 7 tests
 test $DIR/no-run-flag.rs - f (line 11) - compile ... ok
-test $DIR/no-run-flag.rs - f (line 14) - ignore ... ignored
+test $DIR/no-run-flag.rs - f (line 14) ... ignored
 test $DIR/no-run-flag.rs - f (line 17) - compile ... ok
 test $DIR/no-run-flag.rs - f (line 23) - compile fail ... ok
 test $DIR/no-run-flag.rs - f (line 28) - compile ... ok
diff --git a/src/test/rustdoc-ui/run-directory.correct.stdout b/src/test/rustdoc-ui/run-directory.correct.stdout
@@ -1,6 +1,6 @@
 
 running 1 test
-test $DIR/run-directory.rs - foo (line 10) - run ... ok
+test $DIR/run-directory.rs - foo (line 10) ... ok
 
 test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
 
diff --git a/src/test/rustdoc-ui/run-directory.incorrect.stdout b/src/test/rustdoc-ui/run-directory.incorrect.stdout
@@ -1,6 +1,6 @@
 
 running 1 test
-test $DIR/run-directory.rs - foo (line 19) - run ... ok
+test $DIR/run-directory.rs - foo (line 19) ... ok
 
 test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
 
diff --git a/src/test/rustdoc-ui/test-no_std.stdout b/src/test/rustdoc-ui/test-no_std.stdout
@@ -1,6 +1,6 @@
 
 running 1 test
-test $DIR/test-no_std.rs - f (line 10) - run ... ok
+test $DIR/test-no_std.rs - f (line 10) ... ok
 
 test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
 
diff --git a/src/test/rustdoc-ui/test-type.stdout b/src/test/rustdoc-ui/test-type.stdout
@@ -1,10 +1,10 @@
 
 running 5 tests
-test $DIR/test-type.rs - f (line 12) - ignore ... ignored
+test $DIR/test-type.rs - f (line 12) ... ignored
 test $DIR/test-type.rs - f (line 15) - compile ... ok
 test $DIR/test-type.rs - f (line 21) - compile fail ... ok
-test $DIR/test-type.rs - f (line 6) - run ... ok
-test $DIR/test-type.rs - f (line 9) - run ... ok
+test $DIR/test-type.rs - f (line 6) ... ok
+test $DIR/test-type.rs - f (line 9) ... ok
 
 test result: ok. 4 passed; 0 failed; 1 ignored; 0 measured; 0 filtered out; finished in $TIME
 
diff --git a/src/test/rustdoc-ui/unparseable-doc-test.stdout b/src/test/rustdoc-ui/unparseable-doc-test.stdout
@@ -1,6 +1,6 @@
 
 running 1 test
-test $DIR/unparseable-doc-test.rs - foo (line 7) - run ... FAILED
+test $DIR/unparseable-doc-test.rs - foo (line 7) ... FAILED
 
 failures:
 
diff --git a/src/test/ui/test-attrs/test-filter-multiple.run.stdout b/src/test/ui/test-attrs/test-filter-multiple.run.stdout
@@ -1,7 +1,7 @@
 
 running 2 tests
-test test1 - run ... ok
-test test2 - run ... ok
+test test1 ... ok
+test test2 ... ok
 
 test result: ok. 2 passed; 0 failed; 0 ignored; 0 measured; 1 filtered out; finished in $TIME
 
diff --git a/src/test/ui/test-attrs/test-type.run.stdout b/src/test/ui/test-attrs/test-type.run.stdout
@@ -1,7 +1,7 @@
 
 running 3 tests
-test test_no_run - ignore ... ignored
-test test_ok - run ... ok
+test test_no_run ... ignored
+test test_ok ... ok
 test test_panic - should panic ... ok
 
 test result: ok. 2 passed; 0 failed; 1 ignored; 0 measured; 0 filtered out; finished in $TIME
diff --git a/src/test/ui/test-panic-abort-nocapture.run.stdout b/src/test/ui/test-panic-abort-nocapture.run.stdout
@@ -1,12 +1,12 @@
 
 running 4 tests
-test it_fails - run ... about to fail
+test it_fails ... about to fail
 FAILED
 test it_panics - should panic ... about to panic
 ok
-test it_works - run ... about to succeed
+test it_works ... about to succeed
 ok
-test it_writes_to_stdio - run ... hello, world
+test it_writes_to_stdio ... hello, world
 testing123
 ok
 
diff --git a/src/test/ui/test-panic-abort.run.stdout b/src/test/ui/test-panic-abort.run.stdout
@@ -1,10 +1,10 @@
 
 running 5 tests
-test it_exits - run ... FAILED
-test it_fails - run ... FAILED
+test it_exits ... FAILED
+test it_fails ... FAILED
 test it_panics - should panic ... ok
-test it_works - run ... ok
-test no_residual_environment - run ... ok
+test it_works ... ok
+test no_residual_environment ... ok
 
 failures:
 
diff --git a/src/test/ui/test-passed.run.stdout b/src/test/ui/test-passed.run.stdout
@@ -1,7 +1,7 @@
 
 running 2 tests
-test it_works - run ... ok
-test it_works_too - run ... ok
+test it_works ... ok
+test it_works_too ... ok
 
 test result: ok. 2 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
 
diff --git a/src/test/ui/test-thread-capture.run.stdout b/src/test/ui/test-thread-capture.run.stdout
@@ -1,7 +1,7 @@
 
 running 2 tests
-test thready_fail - run ... FAILED
-test thready_pass - run ... ok
+test thready_fail ... FAILED
+test thready_pass ... ok
 
 failures:
 
diff --git a/src/test/ui/test-thread-nocapture.run.stdout b/src/test/ui/test-thread-nocapture.run.stdout
@@ -1,11 +1,11 @@
 
 running 2 tests
-test thready_fail - run ... fee
+test thready_fail ... fee
 fie
 foe
 fum
 FAILED
-test thready_pass - run ... fee
+test thready_pass ... fee
 fie
 foe
 fum
diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs
@@ -2637,12 +2637,11 @@ 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() == 3 {
-                let path = tmp[0].rsplit("test ").next().unwrap();
+            if let Some((left, right)) = s.split_once(" - ") {
+                let path = left.rsplit("test ").next().unwrap();
                 if let Some(ref mut v) = files.get_mut(&path.replace('\\', "/")) {
                     tested += 1;
-                    let mut iter = tmp[1].split("(line ");
+                    let mut iter = right.split("(line ");
                     iter.next();
                     let line = iter
                         .next()

Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ impl TestDesc {`
`148`	`148`	`#[cfg(not(bootstrap))]`
`149`	`149`	`pub fn test_mode(&self) -> &'static str {`
`150`	`150`	`if self.ignore {`
`151`		`- return &"ignore";`
	`151`	`+ return &"";`
`152`	`152`	`}`
`153`	`153`	`match self.should_panic {`
`154`	`154`	`options::ShouldPanic::Yes \| options::ShouldPanic::YesWithMessage(_) => {`
`@@ -165,7 +165,7 @@ impl TestDesc {`
`165`	`165`	`if self.no_run {`
`166`	`166`	`return &"compile";`
`167`	`167`	`}`
`168`		`- &"run"`
	`168`	`+ &""`
`169`	`169`	`}`
`170`	`170`
`171`	`171`	`#[cfg(bootstrap)]`