diff options
author | 2017-04-05 17:41:22 +0000 | |
---|---|---|
committer | 2017-04-06 11:00:12 +0200 | |
commit | 697a328dd6994bcf8f76d9abf09ac0e8734e3a07 (patch) | |
tree | e7472e645cfef8eb3d95fd1825ab11192e5c8dff /src/test/java | |
parent | ee77092b52a4792c9c46cc489cf194acd00bce68 (diff) |
Move ConfigSetting into rules/config.
ConfigSetting was previously in analysis/config, where it was slightly out
of place (as it is a rule, not an integral part of the analysis backend).
This is also necessary to integrate it with ConfigFeatureFlag, as otherwise
this would be a circular dependency (analysis/config <-> rules/config).
ConfigFeatureFlagRule itself has been moved into ConfigRuleClasses, where
it can use the ConfigBaseRule and the nonconfigurable reason from the other
configuration rules.
RELNOTES: None.
PiperOrigin-RevId: 152275823
Diffstat (limited to 'src/test/java')
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/rules/config/ConfigSettingTest.java (renamed from src/test/java/com/google/devtools/build/lib/analysis/config/ConfigSettingTest.java) | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/config/ConfigSettingTest.java b/src/test/java/com/google/devtools/build/lib/rules/config/ConfigSettingTest.java index c277b31ddc..7c9bad5f35 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/config/ConfigSettingTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/config/ConfigSettingTest.java @@ -11,7 +11,7 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -package com.google.devtools.build.lib.analysis.config; +package com.google.devtools.build.lib.rules.config; import static com.google.common.truth.Truth.assertThat; import static org.junit.Assert.assertEquals; @@ -21,17 +21,20 @@ import static org.junit.Assert.assertTrue; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.devtools.build.lib.analysis.ConfiguredRuleClassProvider; +import com.google.devtools.build.lib.analysis.config.BuildConfiguration; +import com.google.devtools.build.lib.analysis.config.BuildOptions; +import com.google.devtools.build.lib.analysis.config.ConfigMatchingProvider; +import com.google.devtools.build.lib.analysis.config.ConfigurationEnvironment; +import com.google.devtools.build.lib.analysis.config.ConfigurationFragmentFactory; +import com.google.devtools.build.lib.analysis.config.FragmentOptions; +import com.google.devtools.build.lib.analysis.config.InvalidConfigurationException; import com.google.devtools.build.lib.analysis.util.BuildViewTestCase; import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.packages.Rule; -import com.google.devtools.build.lib.rules.cpp.CppConfiguration; -import com.google.devtools.build.lib.rules.java.Jvm; -import com.google.devtools.build.lib.rules.python.PythonConfiguration; import com.google.devtools.build.lib.testutil.TestConstants; import com.google.devtools.build.lib.testutil.TestRuleClassProvider; import com.google.devtools.common.options.Option; import java.util.Map; - import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; @@ -322,11 +325,6 @@ public class ConfigSettingTest extends BuildViewTestCase { " 'javacopt': '-Dbar'", " })"); - Map<String, Class<? extends BuildConfiguration.Fragment>> map = ImmutableMap.of( - "copt", CppConfiguration.class, - "unused", PythonConfiguration.class, - "javacopt", Jvm.class - ); Rule target = (Rule) getTarget("//test:match"); assertThat(target.getRuleClassObject().getOptionReferenceFunction().apply(target)) .containsExactly("copt", "javacopt"); |