Simplify RuleClassProvider; it kept two identical lists for no purpose.

Also update HelpCommand to output the configuration options in the hmtl
output.

--
MOS_MIGRATED_REVID=125570665

2 files changed, 2 insertions, 2 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/ConfigurationTestCase.java b/src/test/java/com/google/devtools/build/lib/analysis/util/ConfigurationTestCase.java
index 9dce3488ba..1ca57ace10 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/util/ConfigurationTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/util/ConfigurationTestCase.java
@@ -126,7 +126,7 @@ public abstract class ConfigurationTestCase extends FoundationTestCase {
     analysisMock.setupMockClient(new MockToolsConfig(rootDirectory));
     analysisMock.setupMockWorkspaceFiles(directories.getEmbeddedBinariesRoot());
     configurationFactory = analysisMock.createConfigurationFactory();
-    buildOptionClasses = TestRuleClassProvider.getRuleClassProvider().getOptionFragments();
+    buildOptionClasses = TestRuleClassProvider.getRuleClassProvider().getConfigurationOptions();
   }
 
   protected AnalysisMock getAnalysisMock() {
diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CrosstoolConfigurationLoaderTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CrosstoolConfigurationLoaderTest.java
index b9c305331b..4f26eb6bab 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CrosstoolConfigurationLoaderTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CrosstoolConfigurationLoaderTest.java
@@ -61,7 +61,7 @@ public class CrosstoolConfigurationLoaderTest extends AnalysisTestCase {
 
   private BuildOptions createBuildOptionsForTest(String... args) {
     ImmutableList<Class<? extends FragmentOptions>> testFragments =
-        TestRuleClassProvider.getRuleClassProvider().getOptionFragments();
+        TestRuleClassProvider.getRuleClassProvider().getConfigurationOptions();
     OptionsParser optionsParser = OptionsParser.newOptionsParser(testFragments);
     try {
       optionsParser.parse(args);