Fix a bug when a relative path is used for the execution log

Fixes #8364 RELNOTES: None PiperOrigin-RevId: 248786565
bazelbuild · May 17, 2019 · dd9ac13 · dd9ac13
1 parent d5b163e
commit dd9ac13
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/SpawnLogModule.java b/src/main/java/com/google/devtools/build/lib/bazel/SpawnLogModule.java
@@ -91,7 +91,7 @@ private void initOutputs(CommandEnvironment env) throws IOException {
 
     AsynchronousFileOutputStream outStream = null;
     if (executionOptions.executionLogFile != null) {
-      rawOutput = env.getRuntime().getFileSystem().getPath(executionOptions.executionLogFile);
+      rawOutput = workingDirectory.getRelative(executionOptions.executionLogFile);
       outStream =
           new AsynchronousFileOutputStream(
               workingDirectory.getRelative(executionOptions.executionLogFile));

diff --git a/src/test/shell/bazel/bazel_execlog_test.sh b/src/test/shell/bazel/bazel_execlog_test.sh
@@ -107,4 +107,16 @@ EOF
   fi
 }
 
+function test_dir_relative() {
+  cat > BUILD <<'EOF'
+genrule(
+      name = "rule",
+      outs = ["out.txt"],
+      cmd = "echo hello > $(location out.txt)"
+)
+EOF
+  bazel build //:all --experimental_execution_log_file output 2>&1 >> $TEST_log || fail "could not build"
+  wc output || fail "no output produced"
+}
+
 run_suite "execlog_tests"