commit e3824d43223e63c147c39416b011bc84ed6bbdee
author carmi <carmi@google.com> Tue Apr 03 14:58:26 2018 -0700
committer Copybara-Service <copybara-piper@google.com> Tue Apr 03 15:00:14 2018 -0700
tree ad80579ee295524be9fa46f50771fa887e122861
parent 8d7b1cbbd1f7f13898b2a0edc532ca5bfa6f9ad8

BazelPackageLoader to be invoked on additional tests.
I originally blacklisted BazelPackageLoader on some tests because they became flaky with it.

RELNOTES: None
PiperOrigin-RevId: 191504852

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

diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/RecursivePkgFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/RecursivePkgFunctionTest.java
index 679d276..be2e33b 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/RecursivePkgFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/RecursivePkgFunctionTest.java
@@ -51,7 +51,6 @@
 
   @Before
   public final void createSkyframeExecutor() throws Exception {
-    initializeSkyframeExecutor(/*doPackageLoadingChecks=*/ false);
     skyframeExecutor = getSkyframeExecutor();
   }
 
@@ -97,6 +96,10 @@
 
   @Test
   public void testPackagesUnderMultipleRoots() throws Exception {
+    // PackageLoader doesn't support --package_path.
+    initializeSkyframeExecutor(/*doPackageLoadingChecks=*/ false);
+    skyframeExecutor = getSkyframeExecutor();
+
     Path root1 = rootDirectory.getRelative("root1");
     Path root2 = rootDirectory.getRelative("root2");
     scratch.file(root1 + "/WORKSPACE");