diff options
| author |  ulfjack <ulfjack@google.com> | 2018-06-13 07:59:33 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-06-13 08:02:50 -0700 |
| commit | b5daae329c66e6e7cff7db33a451165b56f8f9ee (patch) | |
| tree | d6afb290336a82e0230b3b04ff807cf402270444 /src/test | |
| parent | f282cc724f0cb4cf99a82a11769643cc357be880 (diff) | |
Move BuildView.Options to a new top-level class
This is in preparation for dismantling BuildView and merging the relevant
parts into AnalysisPhaseRunner.
PiperOrigin-RevId: 200391088
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java | 5 | ||||
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java | 3 |
2 files changed, 5 insertions, 3 deletions
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 3249aa29ab..f05468bc58 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 @@ -24,6 +24,7 @@ import com.google.devtools.build.lib.actions.ActionAnalysisMetadata; import com.google.devtools.build.lib.actions.ActionGraph; import com.google.devtools.build.lib.actions.ActionKeyContext; import com.google.devtools.build.lib.actions.Artifact; +import com.google.devtools.build.lib.analysis.AnalysisOptions; import com.google.devtools.build.lib.analysis.AnalysisResult; import com.google.devtools.build.lib.analysis.BlazeDirectories; import com.google.devtools.build.lib.analysis.BuildView; @@ -243,7 +244,7 @@ public abstract class AnalysisTestCase extends FoundationTestCase { PackageCacheOptions.class, SkylarkSemanticsOptions.class, BuildRequestOptions.class, - BuildView.Options.class, + AnalysisOptions.class, KeepGoingOption.class, LoadingPhaseThreadsOption.class, LoadingOptions.class), @@ -308,7 +309,7 @@ public abstract class AnalysisTestCase extends FoundationTestCase { LoadingOptions loadingOptions = optionsParser.getOptions(LoadingOptions.class); - BuildView.Options viewOptions = optionsParser.getOptions(BuildView.Options.class); + AnalysisOptions viewOptions = optionsParser.getOptions(AnalysisOptions.class); // update --keep_going option if test requested it. boolean keepGoing = flags.contains(Flag.KEEP_GOING); 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 abe57a3361..4ba5c107cd 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 @@ -55,6 +55,7 @@ import com.google.devtools.build.lib.actions.ResourceSet; import com.google.devtools.build.lib.actions.util.ActionsTestUtil; import com.google.devtools.build.lib.actions.util.DummyExecutor; import com.google.devtools.build.lib.analysis.AnalysisEnvironment; +import com.google.devtools.build.lib.analysis.AnalysisOptions; import com.google.devtools.build.lib.analysis.AnalysisResult; import com.google.devtools.build.lib.analysis.AnalysisUtils; import com.google.devtools.build.lib.analysis.BlazeDirectories; @@ -1727,7 +1728,7 @@ public abstract class BuildViewTestCase extends FoundationTestCase { ? Options.getDefaults(LoadingOptions.class) : customLoadingOptions; - BuildView.Options viewOptions = Options.getDefaults(BuildView.Options.class); + AnalysisOptions viewOptions = Options.getDefaults(AnalysisOptions.class); LoadingResult loadingResult = skyframeExecutor.loadTargetPatterns( |