Rollback of commit 62a6f695f95b8dde15fe9b287a290dc7ac06e173.

*** Reason for rollback ***

Breaks //src/test/shell/bazel:persistent_test_runner_test

http://ci.bazel.io/job/bazel-tests/BAZEL_VERSION=HEAD,PLATFORM_NAME=linux-x86_64/lastBuild/testReport/junit/(root)/(empty)/test_simple_scenario/

*** Original change description ***

Also add the duration as the test process time.

Technically, this code is incorrect, because we're calling into spawn strategy,
which might do any amount of additional waiting (e.g., to acquire local
resources). We should change spawn strategy to return structured information
about the subprocess execution, including the wall time, and use that to set
the test information. But for now, this seems good enough.

Fixes #1748.

--
PiperOrigin-RevId: 144096164
MOS_MIGRATED_REVID=144096164

1 files changed, 0 insertions, 3 deletions

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 79d559b73a..4ff761dbe1 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
@@ -176,7 +176,6 @@ public class StandaloneTestStrategy extends TestStrategy {
     // Add the test log to the output
     dataBuilder.addFailedLogs(testLog.toString());
     dataBuilder.addTestTimes(data.getTestTimes(0));
-    dataBuilder.addTestProcessTimes(data.getTestProcessTimes(0));
     processTestOutput(executor, outErr, new TestResult(action, data, false), testLog);
   }
 
@@ -196,7 +195,6 @@ public class StandaloneTestStrategy extends TestStrategy {
       dataBuilder.setPassedLog(data.getPassedLog());
     }
     dataBuilder.addTestTimes(data.getTestTimes(0));
-    dataBuilder.addTestProcessTimes(data.getTestProcessTimes(0));
     dataBuilder.setRunDurationMillis(data.getRunDurationMillis());
     if (data.hasTestCase()) {
       dataBuilder.setTestCase(data.getTestCase());
@@ -310,7 +308,6 @@ public class StandaloneTestStrategy extends TestStrategy {
       } finally {
         long duration = executor.getClock().currentTimeMillis() - startTime;
         builder.addTestTimes(duration);
-        builder.addTestProcessTimes(duration);
         builder.setRunDurationMillis(duration);
         if (streamed != null) {
           streamed.close();