Bazel: Fix testing plugins with acceptance framework

Change-Id: I7498da0397b93b688a35e17b765f550bfcef0a6f
2016-11-16 07:11:21 -08:00
parent f4ad72b3e9
commit fa866d544c
2 changed files with 63 additions and 20 deletions
--- a/gerrit-launcher/src/main/java/com/google/gerrit/launcher/GerritLauncher.java
+++ b/gerrit-launcher/src/main/java/com/google/gerrit/launcher/GerritLauncher.java
@@ -638,6 +638,9 @@ public final class GerritLauncher {
    Path p = null;
    try {
      p = resolveInSourceRoot("eclipse-out");
+      if (!Files.exists(p)) {
+        p = resolveInSourceRoot("bazel-out");
+      }
      Path path = p.getParent().resolve(PRIMARY_BUILD_TOOL);
      if (Files.exists(path)) {
        String content = new String(Files.readAllBytes(path));