From e5aaacf5dfecdf8a38ee41a3d35ca1d333d959df Mon Sep 17 00:00:00 2001
From: Ulf Adams <ulfjack@google.com>
Date: Thu, 24 Sep 2015 12:40:30 +0000
Subject: Remove more uses of errorEventHandler (previously of Reporter).

Removes mutable global state.

--
MOS_MIGRATED_REVID=103837106
---
 .../com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java | 2 +-
 .../google/devtools/build/lib/analysis/util/BuildViewTestCase.java    | 4 ++--
 .../devtools/build/lib/analysis/util/ConfigurationTestCase.java       | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/test/java/com/google')

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 d1c194d32f..04687cf0bd 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
@@ -269,7 +269,7 @@ public abstract class AnalysisTestCase extends FoundationTestCase {
     BuildRequestOptions requestOptions = optionsParser.getOptions(BuildRequestOptions.class);
     ImmutableSortedSet<String> multiCpu = ImmutableSortedSet.copyOf(requestOptions.multiCpus);
     masterConfig = skyframeExecutor.createConfigurations(
-        configurationFactory, buildOptions, directories, multiCpu, false);
+        reporter, configurationFactory, buildOptions, directories, multiCpu, false);
     analysisResult =
         buildView.update(
             loadingResult,
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 fde027105a..36cab0d9b5 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
@@ -272,8 +272,8 @@ public abstract class BuildViewTestCase extends FoundationTestCase {
       BuildOptions buildOptions = ruleClassProvider.createBuildOptions(optionsParser);
       ensureTargetsVisited(buildOptions.getAllLabels().values());
       skyframeExecutor.invalidateConfigurationCollection();
-      return skyframeExecutor.createConfigurations(configurationFactory, buildOptions, directories,
-          ImmutableSet.<String>of(), false);
+      return skyframeExecutor.createConfigurations(reporter, configurationFactory, buildOptions,
+          directories, ImmutableSet.<String>of(), false);
     } catch (InvalidConfigurationException | OptionsParsingException e) {
       throw new IllegalArgumentException(e);
     }
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/ConfigurationTestCase.java b/src/test/java/com/google/devtools/build/lib/analysis/util/ConfigurationTestCase.java
index 9fd44f34e8..efea5197ef 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/util/ConfigurationTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/util/ConfigurationTestCase.java
@@ -154,8 +154,8 @@ public abstract class ConfigurationTestCase extends FoundationTestCase {
     configurationFactory.forbidSanityCheck();
     BuildOptions buildOptions = BuildOptions.of(buildOptionClasses, parser);
     BuildConfigurationCollection collection = skyframeExecutor.createConfigurations(
-        configurationFactory, buildOptions, new BlazeDirectories(outputBase, outputBase, workspace),
-        multiCpu, false);
+        reporter, configurationFactory, buildOptions,
+        new BlazeDirectories(outputBase, outputBase, workspace), multiCpu, false);
     return collection;
   }
 
-- 
cgit v1.2.3