about summary refs log tree commit diff
path: root/src/libtest/lib.rs
diff options
context:
space:
mode:
authorPaul Woolcock <paul@woolcock.us>2017-06-24 20:37:15 -0400
committerPaul Woolcock <paul@woolcock.us>2017-06-25 12:23:20 -0400
commit4154f895d388b1a8634a95ff76892419bebe9cc3 (patch)
treed255449ed5586611c150e428ee6d3035c119f1c3 /src/libtest/lib.rs
parent8edc3cae3bd853fc0d7714c2135754dce0ba10eb (diff)
downloadrust-4154f895d388b1a8634a95ff76892419bebe9cc3.tar.gz
rust-4154f895d388b1a8634a95ff76892419bebe9cc3.zip
only show allowed failure count if there are allowed failures
Diffstat (limited to 'src/libtest/lib.rs')
-rw-r--r--src/libtest/lib.rs16
1 files changed, 13 insertions, 3 deletions
diff --git a/src/libtest/lib.rs b/src/libtest/lib.rs
index 0567be4e604..92cfb862b16 100644
--- a/src/libtest/lib.rs
+++ b/src/libtest/lib.rs
@@ -789,14 +789,24 @@ impl<T: Write> ConsoleTestState<T> {
         } else {
             self.write_pretty("FAILED", term::color::RED)?;
         }
-        let s = format!(
+        let s = if self.allowed_fail > 0 {
+            format!(
                 ". {} passed; {} failed ({} allowed); {} ignored; {} measured; {} filtered out\n\n",
                 self.passed,
-                self.failed,
+                self.failed + self.allowed_fail,
                 self.allowed_fail,
                 self.ignored,
                 self.measured,
-                self.filtered_out);
+                self.filtered_out)
+        } else {
+            format!(
+                ". {} passed; {} failed; {} ignored; {} measured; {} filtered out\n\n",
+                self.passed,
+                self.failed,
+                self.ignored,
+                self.measured,
+                self.filtered_out)
+        };
         self.write_plain(&s)?;
         return Ok(success);
     }