From aa884df6b09ed19fccd83aad67f39653fde5fbed Mon Sep 17 00:00:00 2001 From: Brentley Jones Date: Tue, 30 Nov 2021 03:42:07 -0600 Subject: [PATCH] Show skipped tests as a warning (#14345) This matches the color used for the test outputs themselves. Closes #14235. PiperOrigin-RevId: 412987488 (cherry picked from commit 59e16e944200555da377799aa0d9e8d0674d2e27) --- .../runtime/TerminalTestResultNotifier.java | 26 +++++++++++++++---- 1 file changed, 21 insertions(+), 5 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 b72ca55b808896..33c83402ff6e0e 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 @@ -272,14 +272,30 @@ public void notify(Set summaries, int numberOfExecutedTargets) { } private void addFailureToErrorList(List list, String failureDescription, int count) { - addToErrorList(list, "fails", "fail", failureDescription, count); + addToList(list, AnsiTerminalPrinter.Mode.ERROR, "fails", "fail", failureDescription, count); } - private void addToErrorList( + private void addToWarningList( List list, String singularPrefix, String pluralPrefix, String message, int count) { + addToList(list, AnsiTerminalPrinter.Mode.WARNING, singularPrefix, pluralPrefix, message, count); + } + + private void addToList( + List list, + AnsiTerminalPrinter.Mode mode, + 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 ? singularPrefix : pluralPrefix, message, AnsiTerminalPrinter.Mode.DEFAULT)); + list.add( + String.format( + "%s%d %s %s%s", + mode, + count, + count == 1 ? singularPrefix : pluralPrefix, + message, + AnsiTerminalPrinter.Mode.DEFAULT)); } } @@ -316,7 +332,7 @@ private void printStats(TestResultStats stats) { addFailureToErrorList(results, "to build", stats.failedToBuildCount); addFailureToErrorList(results, "locally", stats.failedLocallyCount); addFailureToErrorList(results, "remotely", stats.failedRemotelyCount); - addToErrorList(results, "was", "were", "skipped", stats.noStatusCount); + addToWarningList(results, "was", "were", "skipped", stats.noStatusCount); printer.print( String.format( "\nExecuted %d out of %d %s: %s.\n",