diff options
author | 2017-09-08 20:43:02 +0200 | |
---|---|---|
committer | 2017-09-11 13:07:00 +0200 | |
commit | 80399bc14ced39936ef19a20f3b8c2d1536aa6c2 (patch) | |
tree | 30dcf021ad690f2f915ca1aa4461a00e30617ab6 /src/main/java/com/google/devtools/build/lib/runtime | |
parent | 5c3467f2d251ae85889caca627794a8f9ff726b2 (diff) |
Options with oldNames will no longer get reported twice in the effective option lists.
Tracking the names together for option identification was useful, but then the same list was being used as the source of options for the parser, which lead to some options being listed twice.
Also complete a few tests that should have already been tested in different orders.
PiperOrigin-RevId: 168024719
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/runtime')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/runtime/AllIncompatibleChangesExpansion.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/runtime/AllIncompatibleChangesExpansion.java b/src/main/java/com/google/devtools/build/lib/runtime/AllIncompatibleChangesExpansion.java index 6c42c207c2..849e18cc92 100644 --- a/src/main/java/com/google/devtools/build/lib/runtime/AllIncompatibleChangesExpansion.java +++ b/src/main/java/com/google/devtools/build/lib/runtime/AllIncompatibleChangesExpansion.java @@ -157,7 +157,8 @@ public class AllIncompatibleChangesExpansion implements ExpansionFunction { // Grab all registered options that are identified as incompatible changes by either name or // by category. Ensure they satisfy our requirements. ArrayList<String> incompatibleChanges = new ArrayList<>(); - for (Map.Entry<String, OptionDefinition> entry : context.getOptionsData().getAllNamedFields()) { + for (Map.Entry<String, OptionDefinition> entry : + context.getOptionsData().getAllOptionDefinitions()) { OptionDefinition optionDefinition = entry.getValue(); if (optionDefinition.getOptionName().startsWith(INCOMPATIBLE_NAME_PREFIX) || optionDefinition.getOptionCategory().equals(INCOMPATIBLE_CATEGORY)) { |