Set correct execroot for info

Fixes #3055.

RELNOTES: `bazel info execution_root` returns the corrrect directory name
for the execution root.
PiperOrigin-RevId: 159701171

2 files changed, 11 insertions, 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
index 336342ba20..52894e7a73 100644
--- 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 abstract class InfoItem {
     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
index e3eb6f5265..b38c40a80f 100755
--- 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\$"
 }