fix(builtin): bin folder was included in runfiles path for tests when…

… link type was 'bin'
bazel-contrib · Dec 20, 2019 · f938ab7 · f938ab7
1 parent 6fad0a5
commit f938ab7
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/internal/linker/index.js b/internal/linker/index.js
@@ -172,6 +172,9 @@ Include as much of the build output as you can without disclosing anything confi
                 const pkg = target.split(':')[0];
                 this.packagePath = path.posix.join(wksp, pkg);
             }
+            // If under runfiles (and not unit testing) then don't add a bin to taget for bin links
+            this.noBin = !!env['TEST_TARGET'] && wksp !== 'build_bazel_rules_nodejs' &&
+                target !== '//internal/linker/test:unit_tests';
         }
         lookupDirectory(dir) {
             if (!this.manifest)
@@ -422,7 +425,8 @@ Include as much of the build output as you can without disclosing anything confi
                         switch (root) {
                             case 'bin':
                                 // FIXME(#1196)
-                                target = path.join(workspaceAbs, bin, toWorkspaceDir(modulePath));
+                                target = runfiles.noBin ? path.join(workspaceAbs, toWorkspaceDir(modulePath)) :
+                                    path.join(workspaceAbs, bin, toWorkspaceDir(modulePath));
                                 break;
                             case 'src':
                                 target = path.join(workspaceAbs, toWorkspaceDir(modulePath));

diff --git a/internal/linker/link_node_modules.ts b/internal/linker/link_node_modules.ts
@@ -126,6 +126,7 @@ async function resolveRoot(root: string|undefined, runfiles: Runfiles) {
 export class Runfiles {
   manifest: Map<string, string>|undefined;
   dir: string|undefined;
+  noBin: boolean;
   /**
    * If the environment gives us enough hints, we can know the path to the package
    * in the form workspace_name/path/to/package
@@ -166,6 +167,10 @@ export class Runfiles {
       const pkg = target.split(':')[0];
       this.packagePath = path.posix.join(wksp, pkg);
     }
+
+    // If under runfiles (and not unit testing) then don't add a bin to taget for bin links
+    this.noBin = !!env['TEST_TARGET'] && wksp !== 'build_bazel_rules_nodejs' &&
+        target !== '//internal/linker/test:unit_tests';
   }
 
   lookupDirectory(dir: string): string|undefined {
@@ -487,7 +492,8 @@ export async function main(args: string[], runfiles: Runfiles) {
       switch (root) {
         case 'bin':
           // FIXME(#1196)
-          target = path.join(workspaceAbs, bin, toWorkspaceDir(modulePath));
+          target = runfiles.noBin ? path.join(workspaceAbs, toWorkspaceDir(modulePath)) :
+                                    path.join(workspaceAbs, bin, toWorkspaceDir(modulePath));
           break;
         case 'src':
           target = path.join(workspaceAbs, toWorkspaceDir(modulePath));