diff options
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/packages/util/PackageLoadingTestCase.java')
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/packages/util/PackageLoadingTestCase.java | 13 |
1 files changed, 8 insertions, 5 deletions
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 e4f1d5177e..24d025382f 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 @@ public abstract class PackageLoadingTestCase extends FoundationTestCase { protected ConfiguredRuleClassProvider ruleClassProvider; protected PackageFactory packageFactory; protected SkyframeExecutor skyframeExecutor; + protected BlazeDirectories directories; @Before public final void initializeSkyframeExecutor() throws Exception { @@ -89,9 +90,14 @@ public abstract class PackageLoadingTestCase extends FoundationTestCase { } 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 @@ public abstract class PackageLoadingTestCase extends FoundationTestCase { SkyframeExecutor skyframeExecutor = SequencedSkyframeExecutor.create( packageFactory, - new BlazeDirectories( - new ServerDirectories(outputBase, outputBase), - rootDirectory, - loadingMock.getProductName()), + directories, null, /* BinTools */ null, /* workspaceStatusActionFactory */ ruleClassProvider.getBuildInfoFactories(), |