commit 7371cf583cfc55f513ab47da9a3605c05a34375e
author Derek Cormier <derek@aspect.dev> Tue Sep 27 16:09:34 2022 -0700
committer Greg Magolan <gmagolan@gmail.com> Wed Sep 28 11:27:36 2022 -0700
tree b4e94301a689cf5bb51f8fb0d557341904d3c08a
parent c725169d52c327b0026a473b9977121b005311ba

fix(builtin): fix a bug where the launcher produces incorrect runfiles path on windows

internal/node/launcher.sh

diff --git a/internal/node/launcher.sh b/internal/node/launcher.sh
index 35fc6d0..191622f 100644
--- a/internal/node/launcher.sh
+++ b/internal/node/launcher.sh
@@ -74,7 +74,12 @@
 # Case 6a is handled like case 3.
 if [ "${TEST_SRCDIR:-}" ]; then
     # Case 4, bazel has identified runfiles for us.
-    RUNFILES="$TEST_SRCDIR"
+    if [ "$(is_windows)" -eq "1" ]; then
+        # If Windows, normalize the path
+        RUNFILES=$(normalize_windows_path "$TEST_SRCDIR")
+    else
+        RUNFILES="$TEST_SRCDIR"
+    fi
 elif [ "${RUNFILES_MANIFEST_FILE:-}" ]; then
     if [ "$(is_windows)" -eq "1" ]; then
         # If Windows, normalize the path

internal/node/test/env.spec.js

diff --git a/internal/node/test/env.spec.js b/internal/node/test/env.spec.js
index 455a864..42a308e 100644
--- a/internal/node/test/env.spec.js
+++ b/internal/node/test/env.spec.js
@@ -58,12 +58,6 @@
       `${runfilesRoot}`,
       `${runfilesRoot}/build_bazel_rules_nodejs/node_modules`,
     ];
-    if (isWindows) {
-      expectedRoots.push(
-        process.env['RUNFILES'],
-        `${process.env['RUNFILES']}/build_bazel_rules_nodejs/node_modules`
-      );
-    }
     expectPathsToMatch(process.env['BAZEL_PATCH_ROOTS'].split(','), expectedRoots);
   });