Adds support for invocation policy to the canonicalize-flags command.

--
MOS_MIGRATED_REVID=112267123

1 files changed, 6 insertions, 2 deletions

diff --git a/src/test/java/com/google/devtools/common/options/OptionsParserTest.java b/src/test/java/com/google/devtools/common/options/OptionsParserTest.java
index 0787a398cc..659f77f690 100644
--- a/src/test/java/com/google/devtools/common/options/OptionsParserTest.java
+++ b/src/test/java/com/google/devtools/common/options/OptionsParserTest.java
@@ -930,8 +930,12 @@ public class OptionsParserTest {
 
   public static List<String> canonicalize(Class<? extends OptionsBase> optionsClass, String... args)
       throws OptionsParsingException {
-    return OptionsParser.canonicalize(ImmutableList.<Class<? extends OptionsBase>>of(optionsClass),
-        Arrays.asList(args));
+
+    OptionsParser parser = OptionsParser.newOptionsParser(
+        ImmutableList.<Class<? extends OptionsBase>>of(optionsClass));
+    parser.setAllowResidue(false);
+    parser.parse(Arrays.asList(args));
+    return parser.canonicalize();
   }
 
   @Test