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
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java b/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java
index ca99496..1cf1cb8 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java
@@ -15,7 +15,6 @@
import com.google.common.base.Functions;
import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Iterables;
import com.google.devtools.build.lib.analysis.ConfiguredRuleClassProvider;
import com.google.devtools.build.lib.analysis.PlatformConfigurationLoader;
@@ -31,8 +30,6 @@
import com.google.devtools.build.lib.rules.apple.swift.SwiftConfiguration;
import com.google.devtools.build.lib.rules.config.ConfigFeatureFlagConfiguration;
import com.google.devtools.build.lib.rules.cpp.CppConfigurationLoader;
-import com.google.devtools.build.lib.rules.cpp.FdoSupportFunction;
-import com.google.devtools.build.lib.rules.cpp.FdoSupportValue;
import com.google.devtools.build.lib.rules.java.JavaConfigurationLoader;
import com.google.devtools.build.lib.rules.java.JvmConfigurationLoader;
import com.google.devtools.build.lib.rules.objc.J2ObjcConfiguration;
@@ -42,8 +39,6 @@
import com.google.devtools.build.lib.testutil.TestRuleClassProvider;
import com.google.devtools.build.lib.vfs.FileSystemUtils;
import com.google.devtools.build.lib.vfs.Path;
-import com.google.devtools.build.skyframe.SkyFunction;
-import com.google.devtools.build.skyframe.SkyFunctionName;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
@@ -311,12 +306,4 @@
public MockCcSupport ccSupport() {
return BazelMockCcSupport.INSTANCE;
}
-
- @Override
- public ImmutableMap<SkyFunctionName, SkyFunction> getSkyFunctions() {
- ImmutableMap.Builder<SkyFunctionName, SkyFunction> skyFunctions = ImmutableMap.builder();
- skyFunctions.putAll(super.getSkyFunctions());
- skyFunctions.put(FdoSupportValue.SKYFUNCTION, new FdoSupportFunction());
- return skyFunctions.build();
- }
}
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisMock.java b/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisMock.java
index ba14b25..c5d64aa 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisMock.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisMock.java
@@ -15,6 +15,7 @@
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
+import com.google.devtools.build.lib.analysis.BlazeDirectories;
import com.google.devtools.build.lib.analysis.ConfiguredRuleClassProvider;
import com.google.devtools.build.lib.analysis.config.ConfigurationFragmentFactory;
import com.google.devtools.build.lib.bazel.rules.android.AndroidNdkRepositoryFunction;
@@ -24,6 +25,8 @@
import com.google.devtools.build.lib.packages.util.LoadingMock;
import com.google.devtools.build.lib.packages.util.MockCcSupport;
import com.google.devtools.build.lib.packages.util.MockToolsConfig;
+import com.google.devtools.build.lib.rules.cpp.FdoSupportFunction;
+import com.google.devtools.build.lib.rules.cpp.FdoSupportValue;
import com.google.devtools.build.lib.rules.repository.LocalRepositoryFunction;
import com.google.devtools.build.lib.rules.repository.LocalRepositoryRule;
import com.google.devtools.build.lib.rules.repository.RepositoryDelegatorFunction;
@@ -65,8 +68,10 @@
}
@Override
- public PackageFactoryBuilderWithSkyframeForTesting getPackageFactoryBuilderForTesting() {
- return super.getPackageFactoryBuilderForTesting().setExtraSkyFunctions(getSkyFunctions());
+ public PackageFactoryBuilderWithSkyframeForTesting getPackageFactoryBuilderForTesting(
+ BlazeDirectories directories) {
+ return super.getPackageFactoryBuilderForTesting(directories)
+ .setExtraSkyFunctions(getSkyFunctions(directories));
}
@Override
@@ -113,7 +118,7 @@
get().ccSupport().setup(config);
}
- public ImmutableMap<SkyFunctionName, SkyFunction> getSkyFunctions() {
+ public ImmutableMap<SkyFunctionName, SkyFunction> getSkyFunctions(BlazeDirectories directories) {
// Some tests require the local_repository rule so we need the appropriate SkyFunctions.
RepositoryFunction localRepositoryFunction = new LocalRepositoryFunction();
ImmutableMap<String, RepositoryFunction> repositoryHandlers = ImmutableMap.of(
@@ -123,10 +128,11 @@
return ImmutableMap.of(
SkyFunctions.REPOSITORY_DIRECTORY,
- new RepositoryDelegatorFunction(
- repositoryHandlers, null, new AtomicBoolean(true)),
+ new RepositoryDelegatorFunction(repositoryHandlers, null, new AtomicBoolean(true)),
SkyFunctions.REPOSITORY,
- new RepositoryLoaderFunction());
+ new RepositoryLoaderFunction(),
+ FdoSupportValue.SKYFUNCTION,
+ new FdoSupportFunction(directories));
}
public static class Delegate extends AnalysisMock {
@@ -182,8 +188,9 @@
}
@Override
- public ImmutableMap<SkyFunctionName, SkyFunction> getSkyFunctions() {
- return delegate.getSkyFunctions();
+ public ImmutableMap<SkyFunctionName, SkyFunction> getSkyFunctions(
+ BlazeDirectories directories) {
+ return delegate.getSkyFunctions(directories);
}
}
}
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java b/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java
index e49dbd1..44e3928 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java
@@ -167,7 +167,7 @@
this.ruleClassProvider = ruleClassProvider;
PackageFactory pkgFactory =
analysisMock
- .getPackageFactoryBuilderForTesting()
+ .getPackageFactoryBuilderForTesting(directories)
.build(ruleClassProvider, scratch.getFileSystem());
BinTools binTools = BinTools.forUnitTesting(directories, analysisMock.getEmbeddedTools());
skyframeExecutor =
@@ -179,7 +179,7 @@
ruleClassProvider.getBuildInfoFactories(),
ImmutableList.<DiffAwareness.Factory>of(),
Predicates.<PathFragment>alwaysFalse(),
- analysisMock.getSkyFunctions(),
+ analysisMock.getSkyFunctions(directories),
ImmutableList.of(),
ImmutableList.<SkyValueDirtinessChecker>of(),
PathFragment.EMPTY_FRAGMENT,
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java
index e6db01b..66a790d 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java
@@ -222,7 +222,7 @@
ImmutableMap.<RepositoryName, PathFragment>of()));
pkgFactory =
analysisMock
- .getPackageFactoryBuilderForTesting()
+ .getPackageFactoryBuilderForTesting(directories)
.setExtraPrecomputeValues(extraPrecomputedValues)
.setEnvironmentExtensions(getEnvironmentExtensions())
.setPlatformSetRegexps(getPlatformSetRegexps())
@@ -237,7 +237,7 @@
ruleClassProvider.getBuildInfoFactories(),
ImmutableList.<DiffAwareness.Factory>of(),
Predicates.<PathFragment>alwaysFalse(),
- analysisMock.getSkyFunctions(),
+ analysisMock.getSkyFunctions(directories),
ImmutableList.of(),
ImmutableList.<SkyValueDirtinessChecker>of(),
PathFragment.EMPTY_FRAGMENT,
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/ConfigurationTestCase.java b/src/test/java/com/google/devtools/build/lib/analysis/util/ConfigurationTestCase.java
index ba5c5ae..09bef53 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/util/ConfigurationTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/util/ConfigurationTestCase.java
@@ -107,7 +107,7 @@
analysisMock.getProductName());
pkgFactory =
analysisMock
- .getPackageFactoryBuilderForTesting()
+ .getPackageFactoryBuilderForTesting(directories)
.build(ruleClassProvider, scratch.getFileSystem());
AnalysisTestUtil.DummyWorkspaceStatusActionFactory workspaceStatusActionFactory =
new AnalysisTestUtil.DummyWorkspaceStatusActionFactory(directories);
@@ -121,7 +121,7 @@
ruleClassProvider.getBuildInfoFactories(),
ImmutableList.<DiffAwareness.Factory>of(),
Predicates.<PathFragment>alwaysFalse(),
- analysisMock.getSkyFunctions(),
+ analysisMock.getSkyFunctions(directories),
ImmutableList.<PrecomputedValue.Injected>of(),
ImmutableList.<SkyValueDirtinessChecker>of(),
PathFragment.EMPTY_FRAGMENT,
diff --git a/src/test/java/com/google/devtools/build/lib/bazel/repository/skylark/SkylarkRepositoryIntegrationTest.java b/src/test/java/com/google/devtools/build/lib/bazel/repository/skylark/SkylarkRepositoryIntegrationTest.java
index 004987d..0aa3b1c 100644
--- a/src/test/java/com/google/devtools/build/lib/bazel/repository/skylark/SkylarkRepositoryIntegrationTest.java
+++ b/src/test/java/com/google/devtools/build/lib/bazel/repository/skylark/SkylarkRepositoryIntegrationTest.java
@@ -19,6 +19,7 @@
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
+import com.google.devtools.build.lib.analysis.BlazeDirectories;
import com.google.devtools.build.lib.analysis.ConfiguredRuleClassProvider;
import com.google.devtools.build.lib.analysis.ConfiguredTarget;
import com.google.devtools.build.lib.analysis.util.AnalysisMock;
@@ -26,8 +27,6 @@
import com.google.devtools.build.lib.bazel.repository.downloader.HttpDownloader;
import com.google.devtools.build.lib.packages.BuildFileContainsErrorsException;
import com.google.devtools.build.lib.packages.NoSuchPackageException;
-import com.google.devtools.build.lib.rules.cpp.FdoSupportFunction;
-import com.google.devtools.build.lib.rules.cpp.FdoSupportValue;
import com.google.devtools.build.lib.rules.repository.LocalRepositoryFunction;
import com.google.devtools.build.lib.rules.repository.LocalRepositoryRule;
import com.google.devtools.build.lib.rules.repository.RepositoryDelegatorFunction;
@@ -67,7 +66,8 @@
}
@Override
- public ImmutableMap<SkyFunctionName, SkyFunction> getSkyFunctions() {
+ public ImmutableMap<SkyFunctionName, SkyFunction> getSkyFunctions(
+ BlazeDirectories directories) {
// Add both the local repository and the skylark repository functions
// The RepositoryCache mock injected with the SkylarkRepositoryFunction
HttpDownloader downloader = Mockito.mock(HttpDownloader.class);
@@ -85,9 +85,7 @@
SkyFunctions.REPOSITORY_DIRECTORY,
function,
SkyFunctions.REPOSITORY,
- new RepositoryLoaderFunction(),
- FdoSupportValue.SKYFUNCTION,
- new FdoSupportFunction());
+ new RepositoryLoaderFunction());
}
}
diff --git a/src/test/java/com/google/devtools/build/lib/packages/util/LoadingMock.java b/src/test/java/com/google/devtools/build/lib/packages/util/LoadingMock.java
index 981403a..0c924aa 100644
--- a/src/test/java/com/google/devtools/build/lib/packages/util/LoadingMock.java
+++ b/src/test/java/com/google/devtools/build/lib/packages/util/LoadingMock.java
@@ -13,6 +13,7 @@
// limitations under the License.
package com.google.devtools.build.lib.packages.util;
+import com.google.devtools.build.lib.analysis.BlazeDirectories;
import com.google.devtools.build.lib.analysis.ConfiguredRuleClassProvider;
import com.google.devtools.build.lib.skyframe.packages.PackageFactoryBuilderWithSkyframeForTesting;
import com.google.devtools.build.lib.testutil.TestConstants;
@@ -29,7 +30,8 @@
return TestConstants.PRODUCT_NAME;
}
- public PackageFactoryBuilderWithSkyframeForTesting getPackageFactoryBuilderForTesting() {
+ public PackageFactoryBuilderWithSkyframeForTesting getPackageFactoryBuilderForTesting(
+ BlazeDirectories directories) {
return (PackageFactoryBuilderWithSkyframeForTesting)
TestConstants.PACKAGE_FACTORY_BUILDER_FACTORY_FOR_TESTING.builder();
}
diff --git a/src/test/java/com/google/devtools/build/lib/packages/util/PackageLoadingTestCase.java b/src/test/java/com/google/devtools/build/lib/packages/util/PackageLoadingTestCase.java
index e4f1d51..24d0253 100644
--- a/src/test/java/com/google/devtools/build/lib/packages/util/PackageLoadingTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/packages/util/PackageLoadingTestCase.java
@@ -72,6 +72,7 @@
protected ConfiguredRuleClassProvider ruleClassProvider;
protected PackageFactory packageFactory;
protected SkyframeExecutor skyframeExecutor;
+ protected BlazeDirectories directories;
@Before
public final void initializeSkyframeExecutor() throws Exception {
@@ -89,9 +90,14 @@
} else {
ruleClassProvider = loadingMock.createRuleClassProvider();
}
+ directories =
+ new BlazeDirectories(
+ new ServerDirectories(outputBase, outputBase),
+ rootDirectory,
+ loadingMock.getProductName());
packageFactory =
loadingMock
- .getPackageFactoryBuilderForTesting()
+ .getPackageFactoryBuilderForTesting(directories)
.setEnvironmentExtensions(getEnvironmentExtensions())
.build(ruleClassProvider, scratch.getFileSystem());
skyframeExecutor = createSkyframeExecutor();
@@ -107,10 +113,7 @@
SkyframeExecutor skyframeExecutor =
SequencedSkyframeExecutor.create(
packageFactory,
- new BlazeDirectories(
- new ServerDirectories(outputBase, outputBase),
- rootDirectory,
- loadingMock.getProductName()),
+ directories,
null, /* BinTools */
null, /* workspaceStatusActionFactory */
ruleClassProvider.getBuildInfoFactories(),
diff --git a/src/test/java/com/google/devtools/build/lib/pkgcache/BuildFileModificationTest.java b/src/test/java/com/google/devtools/build/lib/pkgcache/BuildFileModificationTest.java
index fb7581b..e43d354 100644
--- a/src/test/java/com/google/devtools/build/lib/pkgcache/BuildFileModificationTest.java
+++ b/src/test/java/com/google/devtools/build/lib/pkgcache/BuildFileModificationTest.java
@@ -81,7 +81,7 @@
skyframeExecutor =
SequencedSkyframeExecutor.create(
analysisMock
- .getPackageFactoryBuilderForTesting()
+ .getPackageFactoryBuilderForTesting(directories)
.build(ruleClassProvider, scratch.getFileSystem()),
directories,
null, /* BinTools */
@@ -89,7 +89,7 @@
ruleClassProvider.getBuildInfoFactories(),
ImmutableList.<DiffAwareness.Factory>of(),
Predicates.<PathFragment>alwaysFalse(),
- AnalysisMock.get().getSkyFunctions(),
+ analysisMock.getSkyFunctions(directories),
ImmutableList.<PrecomputedValue.Injected>of(),
ImmutableList.<SkyValueDirtinessChecker>of(),
PathFragment.EMPTY_FRAGMENT,
diff --git a/src/test/java/com/google/devtools/build/lib/pkgcache/IncrementalLoadingTest.java b/src/test/java/com/google/devtools/build/lib/pkgcache/IncrementalLoadingTest.java
index 2afdf03..36378e3 100644
--- a/src/test/java/com/google/devtools/build/lib/pkgcache/IncrementalLoadingTest.java
+++ b/src/test/java/com/google/devtools/build/lib/pkgcache/IncrementalLoadingTest.java
@@ -463,15 +463,17 @@
addFile("WORKSPACE");
LoadingMock loadingMock = LoadingMock.get();
+ BlazeDirectories directories =
+ new BlazeDirectories(
+ new ServerDirectories(fs.getPath("/install"), fs.getPath("/output")),
+ workspace,
+ loadingMock.getProductName());
skyframeExecutor =
SequencedSkyframeExecutor.create(
loadingMock
- .getPackageFactoryBuilderForTesting()
+ .getPackageFactoryBuilderForTesting(directories)
.build(loadingMock.createRuleClassProvider(), fs),
- new BlazeDirectories(
- new ServerDirectories(fs.getPath("/install"), fs.getPath("/output")),
- workspace,
- loadingMock.getProductName()),
+ directories,
null, /* BinTools */
null, /* workspaceStatusActionFactory */
loadingMock.createRuleClassProvider().getBuildInfoFactories(),
diff --git a/src/test/java/com/google/devtools/build/lib/pkgcache/LoadingPhaseRunnerTest.java b/src/test/java/com/google/devtools/build/lib/pkgcache/LoadingPhaseRunnerTest.java
index 5849ce6..8db6217 100644
--- a/src/test/java/com/google/devtools/build/lib/pkgcache/LoadingPhaseRunnerTest.java
+++ b/src/test/java/com/google/devtools/build/lib/pkgcache/LoadingPhaseRunnerTest.java
@@ -589,6 +589,7 @@
private final List<Path> changes = new ArrayList<>();
private final LoadingPhaseRunner loadingPhaseRunner;
+ private final BlazeDirectories directories;
private LoadingOptions options;
private final StoredEventHandler storedErrors;
@@ -606,18 +607,18 @@
mockToolsConfig = new MockToolsConfig(workspace);
analysisMock = AnalysisMock.get();
analysisMock.setupMockClient(mockToolsConfig);
- FileSystemUtils.deleteTree(workspace.getRelative("base"));
-
- ConfiguredRuleClassProvider ruleClassProvider = analysisMock.createRuleClassProvider();
- PackageFactory pkgFactory =
- analysisMock.getPackageFactoryBuilderForTesting().build(ruleClassProvider, fs);
- PackageCacheOptions options = Options.getDefaults(PackageCacheOptions.class);
- storedErrors = new StoredEventHandler();
- BlazeDirectories directories =
+ directories =
new BlazeDirectories(
new ServerDirectories(fs.getPath("/install"), fs.getPath("/output")),
workspace,
analysisMock.getProductName());
+ FileSystemUtils.deleteTree(workspace.getRelative("base"));
+
+ ConfiguredRuleClassProvider ruleClassProvider = analysisMock.createRuleClassProvider();
+ PackageFactory pkgFactory =
+ analysisMock.getPackageFactoryBuilderForTesting(directories).build(ruleClassProvider, fs);
+ PackageCacheOptions options = Options.getDefaults(PackageCacheOptions.class);
+ storedErrors = new StoredEventHandler();
skyframeExecutor =
SequencedSkyframeExecutor.create(
pkgFactory,
@@ -627,7 +628,7 @@
ruleClassProvider.getBuildInfoFactories(),
ImmutableList.<DiffAwareness.Factory>of(),
Predicates.<PathFragment>alwaysFalse(),
- analysisMock.getSkyFunctions(),
+ analysisMock.getSkyFunctions(directories),
ImmutableList.<PrecomputedValue.Injected>of(),
ImmutableList.<SkyValueDirtinessChecker>of(),
PathFragment.EMPTY_FRAGMENT,
diff --git a/src/test/java/com/google/devtools/build/lib/pkgcache/PackageCacheTest.java b/src/test/java/com/google/devtools/build/lib/pkgcache/PackageCacheTest.java
index 1cffeb7..5f6619f 100644
--- a/src/test/java/com/google/devtools/build/lib/pkgcache/PackageCacheTest.java
+++ b/src/test/java/com/google/devtools/build/lib/pkgcache/PackageCacheTest.java
@@ -85,7 +85,7 @@
rootDirectory,
analysisMock.getProductName());
PackageFactory.BuilderForTesting packageFactoryBuilder =
- analysisMock.getPackageFactoryBuilderForTesting();
+ analysisMock.getPackageFactoryBuilderForTesting(directories);
if (!doPackageLoadingChecks) {
packageFactoryBuilder.disableChecks();
}
@@ -98,7 +98,7 @@
ruleClassProvider.getBuildInfoFactories(),
ImmutableList.<DiffAwareness.Factory>of(),
Predicates.<PathFragment>alwaysFalse(),
- AnalysisMock.get().getSkyFunctions(),
+ analysisMock.getSkyFunctions(directories),
ImmutableList.<PrecomputedValue.Injected>of(),
ImmutableList.<SkyValueDirtinessChecker>of(),
PathFragment.EMPTY_FRAGMENT,
diff --git a/src/test/java/com/google/devtools/build/lib/rules/ExternalPackageUtilTest.java b/src/test/java/com/google/devtools/build/lib/rules/ExternalPackageUtilTest.java
index 3b9b3a5..5121102 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/ExternalPackageUtilTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/ExternalPackageUtilTest.java
@@ -114,7 +114,7 @@
new WorkspaceFileFunction(
ruleClassProvider,
analysisMock
- .getPackageFactoryBuilderForTesting()
+ .getPackageFactoryBuilderForTesting(directories)
.setEnvironmentExtensions(
ImmutableList.<EnvironmentExtension>of(
new PackageFactory.EmptyEnvironmentExtension()))
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/ConfigurationsForTargetsTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/ConfigurationsForTargetsTest.java
index f48f95f..11719c2 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/ConfigurationsForTargetsTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/ConfigurationsForTargetsTest.java
@@ -26,6 +26,7 @@
import com.google.common.collect.ListMultimap;
import com.google.common.collect.Multimap;
import com.google.common.collect.SetMultimap;
+import com.google.devtools.build.lib.analysis.BlazeDirectories;
import com.google.devtools.build.lib.analysis.ConfiguredRuleClassProvider;
import com.google.devtools.build.lib.analysis.ConfiguredTarget;
import com.google.devtools.build.lib.analysis.Dependency;
@@ -177,9 +178,10 @@
}
@Override
- public ImmutableMap<SkyFunctionName, SkyFunction> getSkyFunctions() {
+ public ImmutableMap<SkyFunctionName, SkyFunction> getSkyFunctions(
+ BlazeDirectories directories) {
return ImmutableMap.<SkyFunctionName, SkyFunction>builder()
- .putAll(super.getSkyFunctions())
+ .putAll(super.getSkyFunctions(directories))
.put(
ComputeDependenciesFunction.SKYFUNCTION_NAME,
new ComputeDependenciesFunction(stateProvider))
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/ContainingPackageLookupFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/ContainingPackageLookupFunctionTest.java
index 5862dfc..309bece 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/ContainingPackageLookupFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/ContainingPackageLookupFunctionTest.java
@@ -113,7 +113,7 @@
new WorkspaceFileFunction(
ruleClassProvider,
analysisMock
- .getPackageFactoryBuilderForTesting()
+ .getPackageFactoryBuilderForTesting(directories)
.setEnvironmentExtensions(
ImmutableList.<EnvironmentExtension>of(
new PackageFactory.EmptyEnvironmentExtension()))
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/LocalRepositoryLookupFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/LocalRepositoryLookupFunctionTest.java
index 3508a7f..eacefdc 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/LocalRepositoryLookupFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/LocalRepositoryLookupFunctionTest.java
@@ -98,13 +98,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());
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());
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/RecursiveFilesystemTraversalFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/RecursiveFilesystemTraversalFunctionTest.java
index a3fd71d..a926a75 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/RecursiveFilesystemTraversalFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/RecursiveFilesystemTraversalFunctionTest.java
@@ -124,7 +124,7 @@
new WorkspaceFileFunction(
ruleClassProvider,
analysisMock
- .getPackageFactoryBuilderForTesting()
+ .getPackageFactoryBuilderForTesting(directories)
.build(ruleClassProvider, scratch.getFileSystem()),
directories));
skyFunctions.put(SkyFunctions.EXTERNAL_PACKAGE, new ExternalPackageFunction());
