diff options
| author |  Googler <noreply@google.com> | 2017-04-07 16:57:21 -0400 |
|---|---|---|
| committer |  Kristina Chodorow <kchodorow@google.com> | 2017-05-10 13:36:58 -0400 |
| commit | 6879d7ceff0e118fdecb0cabe5134979030b7cb8 (patch) | |
| tree | 384cd9fd67c37442841092b0fe1ac0b5a8b4b483 /src/test/java/com/google/devtools/build/lib/analysis | |
| parent | 34fe247448a9be13fc41f93ac78a071ec157f434 (diff) | |
Automated g4 rollback of commit cbbb423663b154d82e3dfa5e9a56839583987999.
*** Reason for rollback ***
Need to roll this back as part of http://b/38171368
*** Original change description ***
RELNOTES: Effectively remove sysroot from CppConfiguration and allow it to use select statements.
PiperOrigin-RevId: 155547813
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/analysis')
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java | 6 |
1 files changed, 2 insertions, 4 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 7f88ad3241..5b49663020 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 @@ -13,7 +13,6 @@ // limitations under the License. package com.google.devtools.build.lib.analysis.util; - import com.google.common.base.Predicates; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; @@ -127,7 +126,6 @@ public abstract class AnalysisTestCase extends FoundationTestCase { protected MockToolsConfig mockToolsConfig; protected AnalysisMock analysisMock; - protected BuildOptions buildOptions; private OptionsParser optionsParser; protected PackageManager packageManager; private LoadingPhaseRunner loadingPhaseRunner; @@ -248,8 +246,6 @@ public abstract class AnalysisTestCase extends FoundationTestCase { InvocationPolicyEnforcer optionsPolicyEnforcer = analysisMock.getInvocationPolicyEnforcer(); optionsPolicyEnforcer.enforce(optionsParser); - - buildOptions = ruleClassProvider.createBuildOptions(optionsParser); } protected FlagBuilder defaultFlags() { @@ -325,6 +321,8 @@ public abstract class AnalysisTestCase extends FoundationTestCase { viewOptions.keepGoing = flags.contains(Flag.KEEP_GOING); viewOptions.loadingPhaseThreads = LOADING_PHASE_THREADS; + BuildOptions buildOptions = ruleClassProvider.createBuildOptions(optionsParser); + PackageCacheOptions packageCacheOptions = optionsParser.getOptions(PackageCacheOptions.class); PathPackageLocator pathPackageLocator = PathPackageLocator.create( outputBase, packageCacheOptions.packagePath, reporter, rootDirectory, rootDirectory); |