commit 86bd4fdc16e0e71504dfe0428c188fdb9efab77f
author Marian Lobur <loburm@google.com> Wed Sep 16 10:01:38 2015 +0000
committer Florian Weikert <fwe@google.com> Wed Sep 16 10:19:10 2015 +0000
tree 24d079a3fd40b85ff4dc6d86be22987b70b86e1c
parent 806130233d4d190dbfaf6a28feb84eb5a010f1c7

Add experimental flag, that partially disables loading phase (pattern evaluation, test_suite expansion and configuration creation is still there). Also remove some unused code.

--
MOS_MIGRATED_REVID=103177839

src/test/java/com/google/devtools/build/lib/analysis/AspectTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/analysis/AspectTest.java b/src/test/java/com/google/devtools/build/lib/analysis/AspectTest.java
index b051db1..bb9bf22 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/AspectTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/AspectTest.java
@@ -174,4 +174,14 @@
     assertThat(a.getProvider(TestAspects.RuleInfo.class).getData())
         .containsExactly("rule //a:a", "aspect //a:b data hello");
   }
+
+  @RunWith(JUnit4.class)
+  public static class AspectTestWithoutLoading extends AspectTest {
+    @Override
+    @Before
+    public void setUp() throws Exception {
+      disableLoading();
+      super.setUp();
+    }
+  }
 }

src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java

diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java b/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java
index 4e6e041..6feb7bc 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java
@@ -126,6 +126,7 @@
 
   protected AnalysisTestUtil.DummyWorkspaceStatusActionFactory workspaceStatusActionFactory;
   private PathPackageLocator pkgLocator;
+  protected boolean enableLoading = true;
 
   @Override
   protected void setUp() throws Exception {
@@ -256,8 +257,8 @@
 
     LoadingResult loadingResult = loadingPhaseRunner
         .execute(reporter, eventBus, ImmutableList.copyOf(labels), loadingOptions,
-            buildOptions.getAllLabels(), viewOptions.keepGoing, /*determineTests=*/false,
-            /*callback=*/null);
+            buildOptions.getAllLabels(), viewOptions.keepGoing, enableLoading,
+            /*determineTests=*/false, /*callback=*/null);
 
     BuildRequestOptions requestOptions = optionsParser.getOptions(BuildRequestOptions.class);
     ImmutableSortedSet<String> multiCpu = ImmutableSortedSet.copyOf(requestOptions.multiCpus);
@@ -271,7 +272,8 @@
             viewOptions,
             AnalysisTestUtil.TOP_LEVEL_ARTIFACT_CONTEXT,
             reporter,
-            eventBus);
+            eventBus,
+            enableLoading);
   }
 
   protected void update(FlagBuilder config, String... labels) throws Exception {
@@ -363,4 +365,8 @@
   protected void clearAnalysisResult() {
     analysisResult = null;
   }
+
+  protected void disableLoading() {
+    enableLoading = false;
+  }
 }

src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java

diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java
index ac9311d..396f415 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java
@@ -173,6 +173,7 @@
   protected WorkspaceStatusAction.Factory workspaceStatusActionFactory;
 
   private MutableActionGraph mutableActionGraph;
+  protected boolean enableLoading = true;
 
   @Override
   protected void setUp() throws Exception {
@@ -1300,8 +1301,8 @@
     LoadingPhaseRunner runner = new LoadingPhaseRunner(getPackageManager(),
         Collections.unmodifiableSet(ruleClassProvider.getRuleClassMap().keySet()));
     LoadingResult loadingResult = runner.execute(reporter, eventBus, targets, loadingOptions,
-        getTargetConfiguration().getAllLabels(),
-        viewOptions.keepGoing, /*determineTests=*/false, /*callback=*/null);
+        getTargetConfiguration().getAllLabels(), viewOptions.keepGoing,
+        enableLoading, /*determineTests=*/false, /*callback=*/null);
     if (!doAnalysis) {
       // TODO(bazel-team): What's supposed to happen in this case?
       return null;
@@ -1313,7 +1314,8 @@
         viewOptions,
         AnalysisTestUtil.TOP_LEVEL_ARTIFACT_CONTEXT,
         reporter,
-        eventBus);
+        eventBus,
+        enableLoading);
   }
 
   protected static Predicate<Artifact> artifactNamed(final String name) {
@@ -1605,4 +1607,8 @@
 
     return result.build();
   }
+
+  protected void disableLoading() {
+    enableLoading = false;
+  }
 }