commit 651797f4c701e8d298266c69381dedaa8fc81784
author juliexxia <juliexxia@google.com> Wed Aug 01 11:45:13 2018 -0700
committer Copybara-Service <copybara-piper@google.com> Wed Aug 01 11:46:44 2018 -0700
tree 6615ed3aac5abf2d65e8b64ab8376b1f64a27f77
parent c3a08780f72727025c37a56c593a6eb379b07f99

Refactor setupPackageCache to get all BuildConfiguration.Options references out of it.

Setting up the package cache is necessary for proper loading. In the future, BuildConfiguration.Option options will be targets that need to be loaded in order to be parsed. Thus, we will need to be able to do loading before BuildConfiguration.Options are parsed.

PiperOrigin-RevId: 206964473

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

diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/PackageFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/PackageFunctionTest.java
index 0dd046d..1a3dcdd 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/PackageFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/PackageFunctionTest.java
@@ -91,8 +91,8 @@
             "",
             UUID.randomUUID(),
             ImmutableMap.<String, String>of(),
-            ImmutableMap.<String, String>of(),
             new TimestampGranularityMonitor(BlazeClock.instance()));
+    skyframeExecutor.setActionEnv(ImmutableMap.<String, String>of());
   }
 
   @Override
@@ -323,8 +323,8 @@
             "",
             UUID.randomUUID(),
             ImmutableMap.<String, String>of(),
-            ImmutableMap.<String, String>of(),
             tsgm);
+    getSkyframeExecutor().setActionEnv(ImmutableMap.<String, String>of());
     assertSrcs(validPackage(skyKey), "foo", "//foo:a.config", "//foo:b.txt");
   }