diff options
| author |  janakr <janakr@google.com> | 2017-09-22 13:27:14 -0400 |
|---|---|---|
| committer |  John Cater <jcater@google.com> | 2017-09-25 09:37:41 -0400 |
| commit | 52d05e880e453698be7ae9486020ad21977339ad (patch) | |
| tree | e91d144d50e06b290b5c2991a4ba11e423c29569 /src/test/java/com/google/devtools/build/lib/skyframe/PackageLookupFunctionTest.java | |
| 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/skyframe/PackageLookupFunctionTest.java')
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/skyframe/PackageLookupFunctionTest.java | 6 |
1 files changed, 2 insertions, 4 deletions
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 9acccb342d..0e73735305 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 @@ public abstract class PackageLookupFunctionTest extends FoundationTestCase { 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()); |