diff options
author | 2017-09-22 13:27:14 -0400 | |
---|---|---|
committer | 2017-09-25 09:37:41 -0400 | |
commit | 52d05e880e453698be7ae9486020ad21977339ad (patch) | |
tree | e91d144d50e06b290b5c2991a4ba11e423c29569 /src/test/java/com/google/devtools/build/lib/packages/util | |
parent | ff3e01cf8ad1f3d59902a267f158e6be9fa52495 (diff) |
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
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/packages/util')
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/packages/util/LoadingMock.java | 4 | ||||
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/packages/util/PackageLoadingTestCase.java | 13 |
2 files changed, 11 insertions, 6 deletions
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 981403aaf6..0c924aaec3 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 @@ public class LoadingMock { 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 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(), |