Set correct execroot for info

Fixes bazelbuild#3055. RELNOTES: `bazel info execution_root` returns the corrrect directory name for the execution root. PiperOrigin-RevId: 159701171
Asana · Jun 22, 2017 · 8965981 · 8965981
1 parent 29916a9
commit 8965981
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/src/main/java/com/google/devtools/build/lib/runtime/commands/InfoItem.java b/src/main/java/com/google/devtools/build/lib/runtime/commands/InfoItem.java
@@ -181,7 +181,8 @@ public ExecutionRootInfoItem() {
  public byte[] get(Supplier<BuildConfiguration> configurationSupplier, CommandEnvironment env)
  throws AbruptExitException {
  checkNotNull(env);
- return print(env.getDirectories().getExecRoot());
+ return print(env.getDirectories().getExecRoot(
+ configurationSupplier.get().getMainRepositoryName()));
  }
  }
 

diff --git a/src/test/shell/bazel/client_test.sh b/src/test/shell/bazel/client_test.sh
@@ -22,10 +22,14 @@ source "${CURRENT_DIR}/../integration_test_setup.sh" \
  || { echo "integration_test_setup.sh not found!" >&2; exit 1; }
 
 function test_product_name_with_bazel_info() {
- bazel info >& "$TEST_log" || fail "Expected zero exit"
+ cat > WORKSPACE <<EOF
+workspace(name = 'blerp')
+EOF
+ bazel info >& "$TEST_log" || fail "Expected zero exit"
 
- expect_log "^bazel-bin:.*_bazel.*bazel-out.*bin\$"
- expect_log "^bazel-genfiles:.*_bazel.*bazel-out.*genfiles\$"
- expect_log "^bazel-testlogs:.*_bazel.*bazel-out.*testlogs\$"
- expect_log "^output_path:.*_bazel.*bazel-out\$"
+ expect_log "^bazel-bin:.*_bazel.*bazel-out.*bin\$"
+ expect_log "^bazel-genfiles:.*_bazel.*bazel-out.*genfiles\$"
+ expect_log "^bazel-testlogs:.*_bazel.*bazel-out.*testlogs\$"
+ expect_log "^output_path:.*_bazel.*bazel-out\$"
+ expect_log "^execution_root:.*/execroot/blerp\$"
 }