aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Yue Gan <yueg@google.com>2017-03-15 12:11:55 +0000
committerGravatar Yun Peng <pcloudy@google.com>2017-03-16 08:34:19 +0000
commit0d77ed6f90118cc97cdf97ff0fe969902fad14c6 (patch)
tree1443093fe4df9ba1b2642b857bbd656750701f74
parent39014167557d0eb2c2f140e9a48a753e1200e9c2 (diff)
A quick fix for benchmark: clean the first removed result, and add "--expunge".
-- PiperOrigin-RevId: 150179734 MOS_MIGRATED_REVID=150179734
-rw-r--r--src/tools/benchmark/java/com/google/devtools/build/benchmark/BazelBuilder.java2
-rw-r--r--src/tools/benchmark/java/com/google/devtools/build/benchmark/BuildGroupRunner.java1
2 files changed, 2 insertions, 1 deletions
diff --git a/src/tools/benchmark/java/com/google/devtools/build/benchmark/BazelBuilder.java b/src/tools/benchmark/java/com/google/devtools/build/benchmark/BazelBuilder.java
index 974ae17cba..71890b24c7 100644
--- a/src/tools/benchmark/java/com/google/devtools/build/benchmark/BazelBuilder.java
+++ b/src/tools/benchmark/java/com/google/devtools/build/benchmark/BazelBuilder.java
@@ -119,7 +119,7 @@ class BazelBuilder implements Builder {
@Override
public void clean() throws CommandException {
- String[] cleanCommand = {"bazel", "clean"};
+ String[] cleanCommand = {"bazel", "clean", "--expunge"};
Command cmd = new Command(cleanCommand, null, generatedCodeDir.toFile());
cmd.execute();
}
diff --git a/src/tools/benchmark/java/com/google/devtools/build/benchmark/BuildGroupRunner.java b/src/tools/benchmark/java/com/google/devtools/build/benchmark/BuildGroupRunner.java
index aedd7645bc..047a53a1b1 100644
--- a/src/tools/benchmark/java/com/google/devtools/build/benchmark/BuildGroupRunner.java
+++ b/src/tools/benchmark/java/com/google/devtools/build/benchmark/BuildGroupRunner.java
@@ -119,6 +119,7 @@ class BuildGroupRunner {
if (removeFirstResult) {
buildTargetAndGetElapsedTime(buildBinary, envConfig, targetConfig);
+ builder.clean();
}
double elapsedTime = buildTargetAndGetElapsedTime(buildBinary, envConfig, targetConfig);