aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/java_tools/buildjar/java
diff options
context:
space:
mode:
authorGravatar Liam Miller-Cushon <cushon@google.com>2015-08-21 19:24:44 +0000
committerGravatar Han-Wen Nienhuys <hanwen@google.com>2015-08-24 14:02:24 +0000
commit50e2eab707cddb687f2870599b6cca010803daca (patch)
tree3eef6282d39be764cccc4483a7f069ba4da7e7c0 /src/java_tools/buildjar/java
parentb45e262b081620f6b431451c90068718741a4d3e (diff)
Fix -proc:only after e927532
Don't expect FLOW events if the compile policy is set to stop before FLOW (e.g. with -proc:only). Fixes google/bazel#379 -- MOS_MIGRATED_REVID=101242866
Diffstat (limited to 'src/java_tools/buildjar/java')
-rw-r--r--src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/BlazeJavacMain.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/BlazeJavacMain.java b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/BlazeJavacMain.java
index 2ac756670f..6214ee4066 100644
--- a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/BlazeJavacMain.java
+++ b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/BlazeJavacMain.java
@@ -29,6 +29,7 @@ import com.sun.source.util.TaskListener;
import com.sun.tools.javac.api.JavacTaskImpl;
import com.sun.tools.javac.api.JavacTool;
import com.sun.tools.javac.api.MultiTaskListener;
+import com.sun.tools.javac.comp.CompileStates.CompileState;
import com.sun.tools.javac.main.Main;
import com.sun.tools.javac.main.Main.Result;
import com.sun.tools.javac.util.Context;
@@ -150,7 +151,8 @@ public class BlazeJavacMain {
} finally {
if (result.isOK()) {
verifyNotNull(compiler);
- if (compiler.flowEvents() == 0) {
+ if (compiler.shouldStopPolicyIfNoError.isAfter(CompileState.FLOW)
+ && compiler.flowEvents() == 0) {
errOutput.println("Expected at least one FLOW event");
result = Result.ABNORMAL;
}