commit bc8b5e09ff667c7d0bf7186a7a207629e6d7bad5
author Damien Martin-Guillerez <dmarting@google.com> Fri Feb 05 22:09:09 2016 +0000
committer David Chen <dzc@google.com> Sun Feb 07 11:33:18 2016 +0000
tree aa1b70b0471bcdcc6d26c27d0e579971bf0de414
parent 26152a6fc8db13f82553770b675e1a355a8e17ae

Add an intermediate SkyFunction for resolving the external package

The WORKSPACE file parsing needs to be separated into several parts
to enable load of labels in the WORKSPACE file.

This change adds an intermediate SkyFunction, ExternalPackageFunction,
that requires all the WORKSPACE file part to be parsed to resolve
//external: labels.

Issue #824 Step 1.

--
MOS_MIGRATED_REVID=113984026

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

diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/FileFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/FileFunctionTest.java
index 7780f7f..ed239f3 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/FileFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/FileFunctionTest.java
@@ -130,22 +130,30 @@
         new InMemoryMemoizingEvaluator(
             ImmutableMap.<SkyFunctionName, SkyFunction>builder()
                 .put(SkyFunctions.FILE_STATE, new FileStateFunction(tsgm, externalFilesHelper))
-                .put(SkyFunctions.FILE_SYMLINK_CYCLE_UNIQUENESS,
+                .put(
+                    SkyFunctions.FILE_SYMLINK_CYCLE_UNIQUENESS,
                     new FileSymlinkCycleUniquenessFunction())
-                .put(SkyFunctions.FILE_SYMLINK_INFINITE_EXPANSION_UNIQUENESS,
+                .put(
+                    SkyFunctions.FILE_SYMLINK_INFINITE_EXPANSION_UNIQUENESS,
                     new FileSymlinkInfiniteExpansionUniquenessFunction())
                 .put(SkyFunctions.FILE, new FileFunction(pkgLocatorRef))
-                .put(SkyFunctions.PACKAGE,
+                .put(
+                    SkyFunctions.PACKAGE,
                     new PackageFunction(null, null, null, null, null, null, null))
-                .put(SkyFunctions.PACKAGE_LOOKUP,
-                    new PackageLookupFunction(new AtomicReference<>(
-                        ImmutableSet.<PackageIdentifier>of())))
-                .put(SkyFunctions.WORKSPACE_AST,
+                .put(
+                    SkyFunctions.PACKAGE_LOOKUP,
+                    new PackageLookupFunction(
+                        new AtomicReference<>(ImmutableSet.<PackageIdentifier>of())))
+                .put(
+                    SkyFunctions.WORKSPACE_AST,
                     new WorkspaceASTFunction(TestRuleClassProvider.getRuleClassProvider()))
-                .put(SkyFunctions.WORKSPACE_FILE,
-                    new WorkspaceFileFunction(TestRuleClassProvider.getRuleClassProvider(),
+                .put(
+                    SkyFunctions.WORKSPACE_FILE,
+                    new WorkspaceFileFunction(
+                        TestRuleClassProvider.getRuleClassProvider(),
                         new PackageFactory(TestRuleClassProvider.getRuleClassProvider()),
                         new BlazeDirectories(pkgRoot, outputBase, pkgRoot)))
+                .put(SkyFunctions.EXTERNAL_PACKAGE, new ExternalPackageFunction())
                 .build(),
             differencer);
     PrecomputedValue.BUILD_ID.set(differencer, UUID.randomUUID());