aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/tools/benchmark/java
diff options
context:
space:
mode:
authorGravatar Yue Gan <yueg@google.com>2017-03-14 19:06:24 +0000
committerGravatar Yun Peng <pcloudy@google.com>2017-03-14 19:54:34 +0000
commita074b2c10f04e9184ac2b1343eaab7a9b469951d (patch)
treee5ca6d3c169ec5edcff67d9eb87276f93d933275 /src/tools/benchmark/java
parentc6838a14c85996330f8777268266408f4e27722d (diff)
Fix bug that all full clean targets are cleaned.
Only the first target should be cleaned or later incremental build is not incremental. -- PiperOrigin-RevId: 150096210 MOS_MIGRATED_REVID=150096210
Diffstat (limited to 'src/tools/benchmark/java')
-rw-r--r--src/tools/benchmark/java/com/google/devtools/build/benchmark/BuildGroupRunner.java10
1 files changed, 5 insertions, 5 deletions
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 82d4d3b490..aedd7645bc 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
@@ -112,6 +112,11 @@ class BuildGroupRunner {
}
lastIsIncremental = envConfig.getIncremental();
+ // Builder's clean method, only clean before the first target
+ if (targetIndex == 0 && envConfig.getCleanBeforeBuild()) {
+ builder.clean();
+ }
+
if (removeFirstResult) {
buildTargetAndGetElapsedTime(buildBinary, envConfig, targetConfig);
}
@@ -129,11 +134,6 @@ class BuildGroupRunner {
private double buildTargetAndGetElapsedTime(
Path buildBinary, BuildEnvConfig envConfig, BuildTargetConfig targetConfig)
throws CommandException {
- // Builder's clean method
- if (envConfig.getCleanBeforeBuild()) {
- builder.clean();
- }
-
// Run build
double elapsedTime =
builder.buildAndGetElapsedTime(