diff options
Diffstat (limited to 'src/test/java/com')
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/packages/BazelDocumentationTest.java | 4 | ||||
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/packages/util/DocumentationTestUtil.java | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/packages/BazelDocumentationTest.java b/src/test/java/com/google/devtools/build/lib/packages/BazelDocumentationTest.java index 79d4eea62b..8d3f7b3dfc 100644 --- a/src/test/java/com/google/devtools/build/lib/packages/BazelDocumentationTest.java +++ b/src/test/java/com/google/devtools/build/lib/packages/BazelDocumentationTest.java @@ -16,6 +16,7 @@ package com.google.devtools.build.lib.packages; import static java.nio.charset.StandardCharsets.UTF_8; +import com.google.common.collect.ImmutableSet; import com.google.common.io.Files; import com.google.devtools.build.lib.bazel.Bazel; import com.google.devtools.build.lib.bazel.rules.BazelRuleClassProvider; @@ -46,6 +47,7 @@ public class BazelDocumentationTest { DocumentationTestUtil.validateUserManual( Bazel.BAZEL_MODULES, BazelRuleClassProvider.create(), - Files.asCharSource(documentationFile, UTF_8).read()); + Files.asCharSource(documentationFile, UTF_8).read(), + ImmutableSet.of()); } } diff --git a/src/test/java/com/google/devtools/build/lib/packages/util/DocumentationTestUtil.java b/src/test/java/com/google/devtools/build/lib/packages/util/DocumentationTestUtil.java index ca5ecb32b0..fafefe98a0 100644 --- a/src/test/java/com/google/devtools/build/lib/packages/util/DocumentationTestUtil.java +++ b/src/test/java/com/google/devtools/build/lib/packages/util/DocumentationTestUtil.java @@ -57,7 +57,8 @@ public abstract class DocumentationTestUtil { public static void validateUserManual( List<Class<? extends BlazeModule>> modules, ConfiguredRuleClassProvider ruleClassProvider, - String documentationSource) + String documentationSource, + Set<String> extraValidOptions) throws Exception { // if there is a class missing, one can find it using // find . -name "*.java" -exec grep -Hn "@Option(name = " {} \; | grep "xxx" @@ -71,9 +72,7 @@ public abstract class DocumentationTestUtil { BlazeCommandUtils.getStartupOptions(blazeModules)) { validOptions.addAll(Options.getDefaults(optionsClass).asMap().keySet()); } - // --bazelrc and --master_bazelrc are aliases for blaze equivalents. Add these explicitly. - validOptions.add("bazelrc"); - validOptions.add("master_bazelrc"); + validOptions.addAll(extraValidOptions); // collect all command options ServerBuilder serverBuilder = new ServerBuilder(); |