diff options
author | ccalvarin <ccalvarin@google.com> | 2017-06-29 17:05:59 +0200 |
---|---|---|
committer | Marcel Hlopko <hlopko@google.com> | 2017-06-29 17:51:35 +0200 |
commit | 835e8e3722bea0621a900f91875d687f342b649a (patch) | |
tree | 143c4e49863c3105adbafef3affcd991eadcb5ff /src/test/java/com/google/devtools/build/lib/rules/config | |
parent | 2e8be9f09906fe7d34465bcae2435ddea9a74baa (diff) |
Explicitly state the default options categories for options used in blaze testing.
Unlike in the production flags, these flags are only used for internal testing. Tagged them as NO_OP instead of the default UNKNOWN to make it clear that we do not need these to become properly tagged.
PiperOrigin-RevId: 160526472
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/rules/config')
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/rules/config/BUILD | 1 | ||||
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/rules/config/ConfigSettingTest.java | 11 |
2 files changed, 11 insertions, 1 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/rules/config/BUILD b/src/test/java/com/google/devtools/build/lib/rules/config/BUILD index 34c5cadbd7..cf09804243 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/config/BUILD +++ b/src/test/java/com/google/devtools/build/lib/rules/config/BUILD @@ -23,6 +23,7 @@ java_library( "//src/main/java/com/google/devtools/build/lib/cmdline", "//src/main/java/com/google/devtools/build/lib/rules/config", "//src/main/java/com/google/devtools/common/options", + "//src/main/protobuf:option_filters_java_proto", "//src/test/java/com/google/devtools/build/lib:actions_testutil", "//src/test/java/com/google/devtools/build/lib:analysis_testutil", "//src/test/java/com/google/devtools/build/lib:testutil", 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 b46af1e43d..066c1be941 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 @@ -31,7 +31,9 @@ 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.OptionDocumentationCategory; import com.google.devtools.common.options.OptionsParser.OptionUsageRestrictions; +import com.google.devtools.common.options.proto.OptionFilters.OptionEffectTag; import java.util.Map; import org.junit.Test; import org.junit.runner.RunWith; @@ -49,7 +51,12 @@ public class ConfigSettingTest extends BuildViewTestCase { public static class LateBoundTestOptions extends FragmentOptions { public LateBoundTestOptions() {} - @Option(name = "opt_with_default", defaultValue = "null") + @Option( + name = "opt_with_default", + documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, + effectTags = {OptionEffectTag.NO_OP}, + defaultValue = "null" + ) public String optwithDefault; } @@ -86,6 +93,8 @@ public class ConfigSettingTest extends BuildViewTestCase { @Option( name = "internal_option", + documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, + effectTags = {OptionEffectTag.NO_OP}, defaultValue = "super secret", optionUsageRestrictions = OptionUsageRestrictions.INTERNAL ) |