diff options
author | ccalvarin <ccalvarin@google.com> | 2017-04-17 23:37:46 +0200 |
---|---|---|
committer | Klaus Aehlig <aehlig@google.com> | 2017-04-18 11:33:49 +0200 |
commit | 2eaa02e8b630ce94fff39422334c47726ead6324 (patch) | |
tree | 2c6d37b928f5375520470b4214d3e0847581f8e4 /src/test/java | |
parent | 91e4dedd402c214a815eb6e2290998dec1f3d397 (diff) |
Split out option usage restriction from option category.
These are two different concepts. Do not remove category overload compatibility in this CL, to keep this change limited to converting the current uses of category.
With some flyby formatting fixes on affected OptionsBases.
RELNOTES: None.
PiperOrigin-RevId: 153390002
Diffstat (limited to 'src/test/java')
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/analysis/LateBoundSplitUtil.java | 4 | ||||
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/rules/config/ConfigSettingTest.java | 7 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/LateBoundSplitUtil.java b/src/test/java/com/google/devtools/build/lib/analysis/LateBoundSplitUtil.java index ce01c8fab9..2e29666d5d 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/LateBoundSplitUtil.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/LateBoundSplitUtil.java @@ -34,7 +34,7 @@ import com.google.devtools.build.lib.testutil.TestRuleClassProvider; import com.google.devtools.build.lib.testutil.UnknownRuleConfiguredTarget; import com.google.devtools.build.lib.util.FileTypeSet; import com.google.devtools.common.options.Option; - +import com.google.devtools.common.options.OptionsParser.OptionUsageRestrictions; import java.util.List; /** @@ -48,7 +48,7 @@ public class LateBoundSplitUtil { @Option( name = "foo", defaultValue = "", - category = "undocumented" + optionUsageRestrictions = OptionUsageRestrictions.UNDOCUMENTED ) public String fooFlag; diff --git a/src/test/java/com/google/devtools/build/lib/rules/config/ConfigSettingTest.java b/src/test/java/com/google/devtools/build/lib/rules/config/ConfigSettingTest.java index 33514d38b5..6aed49215e 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/config/ConfigSettingTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/config/ConfigSettingTest.java @@ -34,6 +34,7 @@ import com.google.devtools.build.lib.packages.Rule; import com.google.devtools.build.lib.testutil.TestConstants; import com.google.devtools.build.lib.testutil.TestRuleClassProvider; import com.google.devtools.common.options.Option; +import com.google.devtools.common.options.OptionsParser.OptionUsageRestrictions; import java.util.Map; import org.junit.Test; import org.junit.runner.RunWith; @@ -86,7 +87,11 @@ public class ConfigSettingTest extends BuildViewTestCase { public static class InternalTestOptions extends FragmentOptions { public InternalTestOptions() {} - @Option(name = "internal_option", defaultValue = "super secret", category = "internal") + @Option( + name = "internal_option", + defaultValue = "super secret", + optionUsageRestrictions = OptionUsageRestrictions.INTERNAL + ) public String optwithDefault; } |