Set correct execroot for info

kchodorow · philwo · commit 89659810e304 · 2017-06-22T12:31:44.000+02:00
Fixes bazelbuild#3055. RELNOTES: `bazel info execution_root` returns the corrrect directory name for the execution root. PiperOrigin-RevId: 159701171
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\$"
 }

Original file line number	Diff line number	Diff line change
`@@ -181,7 +181,8 @@ public ExecutionRootInfoItem() {`
`181`	`181`	`public byte[] get(Supplier<BuildConfiguration> configurationSupplier, CommandEnvironment env)`
`182`	`182`	`throws AbruptExitException {`
`183`	`183`	`checkNotNull(env);`
`184`		`- return print(env.getDirectories().getExecRoot());`
	`184`	`+ return print(env.getDirectories().getExecRoot(`
	`185`	`+ configurationSupplier.get().getMainRepositoryName()));`
`185`	`186`	`}`
`186`	`187`	`}`
`187`	`188`