diff options
author | Alex Humesky <ahumesky@google.com> | 2016-01-15 19:21:03 +0000 |
---|---|---|
committer | Damien Martin-Guillerez <dmarting@google.com> | 2016-01-15 22:29:53 +0000 |
commit | c5ac4308655cbd7eebb70efde3ce1b9450133aec (patch) | |
tree | 4f78d35486d45b127a9c1990c4333d9a3991a23d /src/test/java/com/google/devtools | |
parent | da1e38736daa2f4187525421308054d4a489ca1a (diff) |
Adds support for invocation policy to the canonicalize-flags command.
--
MOS_MIGRATED_REVID=112267123
Diffstat (limited to 'src/test/java/com/google/devtools')
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/runtime/InvocationPolicyEnforcerTest.java | 2 | ||||
-rw-r--r-- | src/test/java/com/google/devtools/common/options/OptionsParserTest.java | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/runtime/InvocationPolicyEnforcerTest.java b/src/test/java/com/google/devtools/build/lib/runtime/InvocationPolicyEnforcerTest.java index efb2768bfb..cb51c33263 100644 --- a/src/test/java/com/google/devtools/build/lib/runtime/InvocationPolicyEnforcerTest.java +++ b/src/test/java/com/google/devtools/build/lib/runtime/InvocationPolicyEnforcerTest.java @@ -38,7 +38,7 @@ import java.util.List; @RunWith(JUnit4.class) public class InvocationPolicyEnforcerTest { - private static final String STRING_FLAG_DEFAULT = "test string default"; + public static final String STRING_FLAG_DEFAULT = "test string default"; public static class TestOptions extends OptionsBase { 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 |