The test summary in the terminal no longer shows skipped tests as failed.

--
MOS_MIGRATED_REVID=114998075

1 files changed, 14 insertions, 14 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/runtime/TerminalTestResultNotifier.java b/src/main/java/com/google/devtools/build/lib/runtime/TerminalTestResultNotifier.java
index 3027b7f52a..ed8c3569f6 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/TerminalTestResultNotifier.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/TerminalTestResultNotifier.java
@@ -132,6 +132,8 @@ public class TerminalTestResultNotifier implements TestResultNotifier {
     for (TestSummary summary : summaries) {
       if (TestResult.isBlazeTestStatusPassed(summary.getStatus())) {
         stats.passCount++;
+      } else if (summary.getStatus() == BlazeTestStatus.NO_STATUS) {
+        stats.noStatusCount++;
       } else if (summary.getStatus() == BlazeTestStatus.FAILED_TO_BUILD) {
         stats.failedToBuildCount++;
       } else if (summary.ranRemotely()) {
@@ -140,10 +142,6 @@ public class TerminalTestResultNotifier implements TestResultNotifier {
         stats.failedLocallyCount++;
       }
 
-      if (summary.getStatus() == BlazeTestStatus.NO_STATUS) {
-        stats.noStatusCount++;
-      }
-
       if (summary.wasUnreportedWrongSize()) {
         stats.wasUnreportedWrongSize = true;
       }
@@ -172,14 +170,15 @@ public class TerminalTestResultNotifier implements TestResultNotifier {
     printStats(stats);
   }
 
-  private void addToErrorList(List<String> list, String failureDescription, int count) {
+  private void addFailureToErrorList(List<String> list, String failureDescription, int count) {
+    addToErrorList(list, "fails", "fail", failureDescription, count);
+  }
+
+  private void addToErrorList(
+      List<String> list, String singularPrefix, String pluralPrefix, String message, int count) {
     if (count > 0) {
-      list.add(String.format("%s%d %s %s%s",
-              AnsiTerminalPrinter.Mode.ERROR,
-              count,
-              count == 1 ? "fails" : "fail",
-              failureDescription,
-              AnsiTerminalPrinter.Mode.DEFAULT));
+      list.add(String.format("%s%d %s %s%s", AnsiTerminalPrinter.Mode.ERROR, count,
+          count == 1 ? singularPrefix : pluralPrefix, message, AnsiTerminalPrinter.Mode.DEFAULT));
     }
   }
 
@@ -191,9 +190,10 @@ public class TerminalTestResultNotifier implements TestResultNotifier {
       } else if (stats.passCount > 0) {
         results.add(stats.passCount + " tests pass");
       }
-      addToErrorList(results, "to build", stats.failedToBuildCount);
-      addToErrorList(results, "locally", stats.failedLocallyCount);
-      addToErrorList(results, "remotely", stats.failedRemotelyCount);
+      addFailureToErrorList(results, "to build", stats.failedToBuildCount);
+      addFailureToErrorList(results, "locally", stats.failedLocallyCount);
+      addFailureToErrorList(results, "remotely", stats.failedRemotelyCount);
+      addToErrorList(results, "was", "were", "skipped", stats.noStatusCount);
       printer.print(String.format("\nExecuted %d out of %d tests: %s.\n",
               stats.numberOfExecutedTargets,
               stats.numberOfTargets,