diff options
Diffstat (limited to 'src/main/java')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/buildeventstream/proto/build_event_stream.proto | 4 | ||||
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/exec/TestAttempt.java | 13 |
2 files changed, 16 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/buildeventstream/proto/build_event_stream.proto b/src/main/java/com/google/devtools/build/lib/buildeventstream/proto/build_event_stream.proto index 85439806c7..1323584b49 100644 --- a/src/main/java/com/google/devtools/build/lib/buildeventstream/proto/build_event_stream.proto +++ b/src/main/java/com/google/devtools/build/lib/buildeventstream/proto/build_event_stream.proto @@ -499,6 +499,10 @@ message TestResult { // The status of this test. TestStatus status = 5; + // Additional details about the status of the test. This is intended for + // user display and must not be parsed. + string status_details = 9; + // True, if the reported attempt is taken from the tool's local cache. bool cached_locally = 4; diff --git a/src/main/java/com/google/devtools/build/lib/exec/TestAttempt.java b/src/main/java/com/google/devtools/build/lib/exec/TestAttempt.java index ed70ad2141..deec19e3f3 100644 --- a/src/main/java/com/google/devtools/build/lib/exec/TestAttempt.java +++ b/src/main/java/com/google/devtools/build/lib/exec/TestAttempt.java @@ -42,6 +42,7 @@ public class TestAttempt implements BuildEventWithOrderConstraint { private final TestRunnerAction testAction; private final TestStatus status; + private final String statusDetails; private final boolean cachedLocally; private final int attempt; private final boolean lastAttempt; @@ -64,6 +65,7 @@ public class TestAttempt implements BuildEventWithOrderConstraint { BuildEventStreamProtos.TestResult.ExecutionInfo executionInfo, int attempt, BlazeTestStatus status, + String statusDetails, long startTimeMillis, long durationMillis, Collection<Pair<String, Path>> files, @@ -73,6 +75,7 @@ public class TestAttempt implements BuildEventWithOrderConstraint { this.executionInfo = Preconditions.checkNotNull(executionInfo); this.attempt = attempt; this.status = BuildEventStreamerUtils.bepStatus(Preconditions.checkNotNull(status)); + this.statusDetails = statusDetails; this.cachedLocally = cachedLocally; this.startTimeMillis = startTimeMillis; this.durationMillis = durationMillis; @@ -98,6 +101,7 @@ public class TestAttempt implements BuildEventWithOrderConstraint { executionInfo, attempt, attemptData.getStatus(), + attemptData.getStatusDetails(), attemptData.getStartTimeMillisEpoch(), attemptData.getRunDurationMillis(), files, @@ -118,6 +122,7 @@ public class TestAttempt implements BuildEventWithOrderConstraint { executionInfo, attempt, attemptData.getStatus(), + attemptData.getStatusDetails(), attemptData.getStartTimeMillisEpoch(), attemptData.getRunDurationMillis(), files, @@ -184,10 +189,16 @@ public class TestAttempt implements BuildEventWithOrderConstraint { @Override public BuildEventStreamProtos.BuildEvent asStreamProto(BuildEventContext converters) { + return GenericBuildEvent.protoChaining(this).setTestResult(asTestResult(converters)).build(); + } + + @VisibleForTesting + public BuildEventStreamProtos.TestResult asTestResult(BuildEventContext converters) { PathConverter pathConverter = converters.pathConverter(); BuildEventStreamProtos.TestResult.Builder builder = BuildEventStreamProtos.TestResult.newBuilder(); builder.setStatus(status); + builder.setStatusDetails(statusDetails); builder.setExecutionInfo(executionInfo); builder.setCachedLocally(cachedLocally); builder.setTestAttemptStartMillisEpoch(startTimeMillis); @@ -200,6 +211,6 @@ public class TestAttempt implements BuildEventWithOrderConstraint { .setUri(pathConverter.apply(file.getSecond())) .build()); } - return GenericBuildEvent.protoChaining(this).setTestResult(builder.build()).build(); + return builder.build(); } } |