diff options
| author |  Klaus Aehlig <aehlig@google.com> | 2017-08-30 14:58:28 +0200 |
|---|---|---|
| committer |  Vladimir Moskva <vladmos@google.com> | 2017-08-30 18:24:57 +0200 |
| commit | 1d71c0c67158d96efd9f2ebeb84c87b76d628477 (patch) | |
| tree | 6da06a7732619a1d70df0480cb8520eb233c4234 /src/main/java/com/google/devtools | |
| parent | 4763abc3764042323efc30844b5b16a8e20fca02 (diff) | |
In terse test_summary, skip no-status tests
If there is a build failure, don't clobber the terse test summary
by naming all the (usually many) tests that were skipped due to
this failure.
Change-Id: I6daae3efb1594c2b1018f87a50cf63949a34535b
PiperOrigin-RevId: 166983264
Diffstat (limited to 'src/main/java/com/google/devtools')
3 files changed, 6 insertions, 4 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/exec/ExecutionOptions.java b/src/main/java/com/google/devtools/build/lib/exec/ExecutionOptions.java index ecea21a1da..3be1d4eac6 100644 --- a/src/main/java/com/google/devtools/build/lib/exec/ExecutionOptions.java +++ b/src/main/java/com/google/devtools/build/lib/exec/ExecutionOptions.java @@ -185,8 +185,8 @@ public class ExecutionOptions extends OptionsBase { help = "Specifies the desired format ot the test summary. Valid values are 'short' to print " + "information only about tests executed, 'terse', to print information only about " - + "unsuccessful tests, 'detailed' to print detailed information about failed " - + "test cases, and 'none' to omit the summary." + + "unsuccessful tests that were run, 'detailed' to print detailed information about " + + "failed test cases, and 'none' to omit the summary." ) public TestSummaryFormat testSummary; diff --git a/src/main/java/com/google/devtools/build/lib/exec/TestStrategy.java b/src/main/java/com/google/devtools/build/lib/exec/TestStrategy.java index 78a878657f..445326abb6 100644 --- a/src/main/java/com/google/devtools/build/lib/exec/TestStrategy.java +++ b/src/main/java/com/google/devtools/build/lib/exec/TestStrategy.java @@ -118,7 +118,7 @@ public abstract class TestStrategy implements TestActionContext { public enum TestSummaryFormat { SHORT, // Print information only about tests. - TERSE, // Like "SHORT", but even shorter: Do not print PASSED tests. + TERSE, // Like "SHORT", but even shorter: Do not print PASSED and NO STATUS tests. DETAILED, // Print information only about failed test cases. NONE; // Do not print summary. 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 ced2070938..fcb2010b28 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 @@ -122,7 +122,9 @@ public class TerminalTestResultNotifier implements TestResultNotifier { private void printShortSummary(Set<TestSummary> summaries, boolean showPassingTests) { boolean withConfig = duplicateLabels(summaries); for (TestSummary summary : summaries) { - if (summary.getStatus() != BlazeTestStatus.PASSED || showPassingTests) { + if ((summary.getStatus() != BlazeTestStatus.PASSED + && summary.getStatus() != BlazeTestStatus.NO_STATUS) + || showPassingTests) { TestSummaryPrinter.print(summary, printer, summaryOptions.verboseSummary, false, withConfig); } |