diff options
Diffstat (limited to 'src')
3 files changed, 10 insertions, 18 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/runtime/SpawnStats.java b/src/main/java/com/google/devtools/build/lib/runtime/SpawnStats.java index dcb68ca8a9..9a95501b6b 100644 --- a/src/main/java/com/google/devtools/build/lib/runtime/SpawnStats.java +++ b/src/main/java/com/google/devtools/build/lib/runtime/SpawnStats.java @@ -42,7 +42,6 @@ class SpawnStats { private static class ResultString { StringBuilder result = new StringBuilder(); - String firstRunner; int spawnsCount = 0; int runnersNum = 0; @@ -54,10 +53,6 @@ class SpawnStats { spawnsCount += count; runnersNum += 1; - if (runnersNum == 1) { - firstRunner = name; - } - if (result.length() > 0) { result.append(", "); } @@ -71,9 +66,6 @@ class SpawnStats { if (runnersNum == 0) { return ""; } - if (runnersNum == 1) { - return ", " + firstRunner; - } return ": " + result; } } diff --git a/src/test/java/com/google/devtools/build/lib/runtime/SpawnStatsTest.java b/src/test/java/com/google/devtools/build/lib/runtime/SpawnStatsTest.java index 968108db64..a145562fa1 100644 --- a/src/test/java/com/google/devtools/build/lib/runtime/SpawnStatsTest.java +++ b/src/test/java/com/google/devtools/build/lib/runtime/SpawnStatsTest.java @@ -43,20 +43,20 @@ public final class SpawnStatsTest { @Test public void one() { stats.countRunnerName("foo"); - assertThat(stats.getSummary()).isEqualTo("1 process, foo."); + assertThat(stats.getSummary()).isEqualTo("1 process: 1 foo."); } @Test public void oneRemote() { stats.countRunnerName("remote cache hit"); - assertThat(stats.getSummary()).isEqualTo("1 process, remote cache hit."); + assertThat(stats.getSummary()).isEqualTo("1 process: 1 remote cache hit."); } @Test public void two() { stats.countRunnerName("foo"); stats.countRunnerName("foo"); - assertThat(stats.getSummary()).isEqualTo("2 processes, foo."); + assertThat(stats.getSummary()).isEqualTo("2 processes: 2 foo."); } @Test @@ -105,7 +105,7 @@ public final class SpawnStatsTest { spawns.add(rA); stats.countActionResult(ActionResult.create(spawns)); - assertThat(stats.getSummary()).isEqualTo("1 process, abc."); + assertThat(stats.getSummary()).isEqualTo("1 process: 1 abc."); } @Test @@ -118,7 +118,7 @@ public final class SpawnStatsTest { spawns.add(rA); stats.countActionResult(ActionResult.create(spawns)); - assertThat(stats.getSummary()).isEqualTo("3 processes, abc."); + assertThat(stats.getSummary()).isEqualTo("3 processes: 3 abc."); } @Test diff --git a/src/test/shell/bazel/bazel_spawnstats_test.sh b/src/test/shell/bazel/bazel_spawnstats_test.sh index 958296f47f..e9fa2a3827 100755 --- a/src/test/shell/bazel/bazel_spawnstats_test.sh +++ b/src/test/shell/bazel/bazel_spawnstats_test.sh @@ -55,28 +55,28 @@ function statistics_single() { } function test_local() { - statistics_single "--spawn_strategy=local" ", local" + statistics_single "--spawn_strategy=local" ": 1 local" } function test_local_sandbox() { if [[ "$PLATFORM" == "linux" ]]; then - statistics_single "--spawn_strategy=linux-sandbox" ", linux-sandbox" + statistics_single "--spawn_strategy=linux-sandbox" ": 1 linux-sandbox" fi } # We are correctly resetting the counts function test_repeat() { flags="--spawn_strategy=local" - statistics_single $flags ", local" + statistics_single $flags ": 1 local" bazel clean $flags - statistics_single $flags ", local" + statistics_single $flags ": 1 local" } # Locally cached results are not yet displayed function test_localcache() { flags="--spawn_strategy=local" # We are correctly resetting the counts - statistics_single $flags ", local" + statistics_single $flags ": 1 local" statistics_single $flags "0 processes." } |