commit 52d05e880e453698be7ae9486020ad21977339ad
author janakr <janakr@google.com> Fri Sep 22 13:27:14 2017 -0400
committer John Cater <jcater@google.com> Mon Sep 25 09:37:41 2017 -0400
tree e91d144d50e06b290b5c2991a4ba11e423c29569
parent ff3e01cf8ad1f3d59902a267f158e6be9fa52495

Inject BlazeDirectories into FdoSupportFunction directly, instead of depending on a precomputed value. BlazeDirectories don't change over the lifetime of the Blaze server, and certainly not over the lifetime of a SkyframeExecutor instance, which already had a reference to them.

The goal is getting rid of the precomputed value entirely, but since this change necessitated a fair number of testing changes, I'm mailing this out as a first step.

PiperOrigin-RevId: 169705474

src/test/java/com/google/devtools/build/lib/skyframe/PackageLookupFunctionTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/PackageLookupFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/PackageLookupFunctionTest.java
index 9acccb3..0e73735 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/PackageLookupFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/PackageLookupFunctionTest.java
@@ -119,13 +119,11 @@
         new WorkspaceFileFunction(
             ruleClassProvider,
             analysisMock
-                .getPackageFactoryBuilderForTesting()
+                .getPackageFactoryBuilderForTesting(directories)
                 .setEnvironmentExtensions(
                     ImmutableList.<EnvironmentExtension>of(
                         new PackageFactory.EmptyEnvironmentExtension()))
-                .build(
-                    ruleClassProvider,
-                    scratch.getFileSystem()),
+                .build(ruleClassProvider, scratch.getFileSystem()),
             directories));
     skyFunctions.put(SkyFunctions.EXTERNAL_PACKAGE, new ExternalPackageFunction());
     skyFunctions.put(SkyFunctions.LOCAL_REPOSITORY_LOOKUP, new LocalRepositoryLookupFunction());