aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com
diff options
context:
space:
mode:
authorGravatar aehlig <aehlig@google.com>2017-07-10 14:39:33 +0200
committerGravatar László Csomor <laszlocsomor@google.com>2017-07-10 17:41:23 +0200
commitd03d87f67ed7f55c23298a019186b4e84184688f (patch)
tree72bfb5271a155bf64d5034b8b6cb072e36002fc3 /src/main/java/com
parentd579b6eafd1d41a73c0dfce7b9ffcfdf1d607a97 (diff)
BEP: Report test warnings
Also report test warnings, if any, for completed test actions in the build event protocol. RELNOTES: None PiperOrigin-RevId: 161384061
Diffstat (limited to 'src/main/java/com')
-rw-r--r--src/main/java/com/google/devtools/build/lib/buildeventstream/proto/build_event_stream.proto3
-rw-r--r--src/main/java/com/google/devtools/build/lib/exec/StandaloneTestStrategy.java2
-rw-r--r--src/main/java/com/google/devtools/build/lib/rules/test/TestAttempt.java10
3 files changed, 14 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 200784b535..7e8253e244 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
@@ -429,6 +429,9 @@ message TestResult {
// Files (logs, test.xml, undeclared outputs, etc) generated by that test
// action.
repeated File test_action_output = 2;
+
+ // Warnings generated by that test action.
+ repeated string warning = 7;
}
// Payload of the event summarizing a test.
diff --git a/src/main/java/com/google/devtools/build/lib/exec/StandaloneTestStrategy.java b/src/main/java/com/google/devtools/build/lib/exec/StandaloneTestStrategy.java
index c10ca1626d..31913957bc 100644
--- a/src/main/java/com/google/devtools/build/lib/exec/StandaloneTestStrategy.java
+++ b/src/main/java/com/google/devtools/build/lib/exec/StandaloneTestStrategy.java
@@ -179,6 +179,7 @@ public class StandaloneTestStrategy extends TestStrategy {
data.getStartTimeMillisEpoch(),
data.getRunDurationMillis(),
testOutputsBuilder.build(),
+ data.getWarningList(),
true));
finalizeTest(actionExecutionContext, action, dataBuilder.build());
} catch (IOException e) {
@@ -227,6 +228,7 @@ public class StandaloneTestStrategy extends TestStrategy {
data.getStartTimeMillisEpoch(),
data.getRunDurationMillis(),
testOutputsBuilder.build(),
+ data.getWarningList(),
false));
processTestOutput(actionExecutionContext, new TestResult(action, data, false), testLog);
}
diff --git a/src/main/java/com/google/devtools/build/lib/rules/test/TestAttempt.java b/src/main/java/com/google/devtools/build/lib/rules/test/TestAttempt.java
index 2516b5b642..fbccaeaf09 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/test/TestAttempt.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/test/TestAttempt.java
@@ -27,6 +27,7 @@ import com.google.devtools.build.lib.vfs.Path;
import com.google.devtools.build.lib.view.test.TestStatus.BlazeTestStatus;
import com.google.devtools.build.lib.view.test.TestStatus.TestResultData;
import java.util.Collection;
+import java.util.List;
/** This event is raised whenever an individual test attempt is completed. */
public class TestAttempt implements BuildEvent {
@@ -37,6 +38,7 @@ public class TestAttempt implements BuildEvent {
private final int attempt;
private final boolean lastAttempt;
private final Collection<Pair<String, Path>> files;
+ private final List<String> testWarnings;
private final long durationMillis;
private final long startTimeMillis;
@@ -55,6 +57,7 @@ public class TestAttempt implements BuildEvent {
long startTimeMillis,
long durationMillis,
Collection<Pair<String, Path>> files,
+ List<String> testWarnings,
boolean lastAttempt) {
this.testAction = testAction;
this.attempt = attempt;
@@ -63,6 +66,7 @@ public class TestAttempt implements BuildEvent {
this.startTimeMillis = startTimeMillis;
this.durationMillis = durationMillis;
this.files = files;
+ this.testWarnings = testWarnings;
this.lastAttempt = lastAttempt;
}
@@ -73,8 +77,10 @@ public class TestAttempt implements BuildEvent {
long startTimeMillis,
long durationMillis,
Collection<Pair<String, Path>> files,
+ List<String> testWarnings,
boolean lastAttempt) {
- this(false, testAction, attempt, status, startTimeMillis, durationMillis, files, lastAttempt);
+ this(false, testAction, attempt, status, startTimeMillis, durationMillis, files, testWarnings,
+ lastAttempt);
}
public static TestAttempt fromCachedTestResult(TestResult result) {
@@ -87,6 +93,7 @@ public class TestAttempt implements BuildEvent {
data.getStartTimeMillisEpoch(),
data.getRunDurationMillis(),
result.getFiles(),
+ result.getData().getWarningList(),
true);
}
@@ -124,6 +131,7 @@ public class TestAttempt implements BuildEvent {
builder.setCachedLocally(cachedLocally);
builder.setTestAttemptStartMillisEpoch(startTimeMillis);
builder.setTestAttemptDurationMillis(durationMillis);
+ builder.addAllWarning(testWarnings);
for (Pair<String, Path> file : files) {
builder.addTestActionOutput(
BuildEventStreamProtos.File.newBuilder()