fix(builtin): write stdout/stderr to correct path under chdir

fixes bazel-contrib#2680
alexeagle · May 17, 2021 · 8490e79 · 8490e79
1 parent 8319dbf
commit 8490e79
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/internal/node/launcher.sh b/internal/node/launcher.sh
@@ -187,9 +187,9 @@ for ARG in ${ALL_ARGS[@]+"${ALL_ARGS[@]}"}; do
     # Supply custom linker arguments for first-party dependencies
     --bazel_node_modules_manifest=*) MODULES_MANIFEST="${ARG#--bazel_node_modules_manifest=}" ;;
     # Captures stdout of the node process to the file specified
-    --bazel_capture_stdout=*) STDOUT_CAPTURE="${ARG#--bazel_capture_stdout=}" ;;
+    --bazel_capture_stdout=*) STDOUT_CAPTURE="${PWD}/${ARG#--bazel_capture_stdout=}" ;;
     # Captures stderr of the node process to the file specified
-    --bazel_capture_stderr=*) STDERR_CAPTURE="${ARG#--bazel_capture_stderr=}" ;;
+    --bazel_capture_stderr=*) STDERR_CAPTURE="${PWD}/${ARG#--bazel_capture_stderr=}" ;;
     # Captures the exit code of the node process to the file specified
     --bazel_capture_exit_code=*) EXIT_CODE_CAPTURE="${ARG#--bazel_capture_exit_code=}" ;;
     # Disable the node_loader.js monkey patches for require()

diff --git a/internal/node/test/chdir/BUILD.bazel b/internal/node/test/chdir/BUILD.bazel
@@ -25,6 +25,7 @@ npm_package_bin(
     args = ["/".join([".."] * _package_segments + ["$@"])],
     chdir = package_name(),
     data = ["_package.json"],
+    stdout = "do_copy.log",
     tool = ":tool_cp",
 )
 

diff --git a/internal/node/test/chdir/cp.js b/internal/node/test/chdir/cp.js
@@ -12,3 +12,4 @@ function mkdirp(p) {
 
 mkdirp(dirname(dest));
 fs.copyFileSync('_package.json', dest);
+console.log('Copied _package.json ->', dest);
Original file line number	Diff line number	Diff line change
Expand Up		@@ -12,3 +12,4 @@ function mkdirp(p) {

		mkdirp(dirname(dest));
		fs.copyFileSync('_package.json', dest);
		console.log('Copied _package.json ->', dest);