Skip to content
This repository has been archived by the owner on Jan 11, 2024. It is now read-only.

Commit

Permalink
Make symlinks consistent
Browse files Browse the repository at this point in the history
PiperOrigin-RevId: 155105523
  • Loading branch information
kchodorow authored and damienmg committed May 4, 2017
1 parent ba51cda commit d0242ce
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -359,10 +359,9 @@ void executeBuild(UUID buildId, AnalysisResult analysisResult,
if (targetConfigurations.size() == 1) {
String productName = runtime.getProductName();
String dirName = env.getWorkspaceName();
String workspaceName = analysisResult.getWorkspaceName();
OutputDirectoryLinksUtils.createOutputDirectoryLinks(
dirName, env.getWorkspace(), env.getDirectories().getExecRoot(workspaceName),
env.getDirectories().getOutputPath(workspaceName), getReporter(), targetConfiguration,
dirName, env.getWorkspace(), env.getDirectories().getExecRoot(),
env.getDirectories().getOutputPath(), getReporter(), targetConfiguration,
request.getBuildOptions().getSymlinkPrefix(productName), productName);
}

Expand Down
5 changes: 4 additions & 1 deletion src/test/shell/bazel/execroot_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,10 @@ genrule(
EOF

bazel build -s //dir:use-srcs &> $TEST_log || fail "expected success"
test -e "$(bazel info execution_root)/../${ws_name}"
execroot="$(bazel info execution_root)"
test -e "$execroot/../${ws_name}"
ls -l bazel-out | tee out
assert_contains "$execroot/bazel-out" out
}

run_suite "execution root tests"

0 comments on commit d0242ce

Please sign in to comment.