diff options
author | laurentlb <laurentlb@google.com> | 2018-02-16 04:14:46 -0800 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2018-02-16 04:16:43 -0800 |
commit | 2195b1c4a17624be1f4863c9112af0664571a5b7 (patch) | |
tree | a10b2fa525af7983b2e4f3e36a8671b850d35bc7 /src/test/java | |
parent | b78a5c1d93f000cc813e1145cb6d79fe90355f29 (diff) |
Remove old flags.
RELNOTES:
Removed flags `--incompatible_checked_arithmetic`, `--incompatible_dict_literal_has_no_duplicates`, `--incompatible_disallow_keyword_only_args`, and ` --incompatible_comprehension_variables_do_not_leak`.
PiperOrigin-RevId: 185977740
Diffstat (limited to 'src/test/java')
4 files changed, 3 insertions, 33 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/packages/SkylarkSemanticsConsistencyTest.java b/src/test/java/com/google/devtools/build/lib/packages/SkylarkSemanticsConsistencyTest.java index 339f060ce4..276a1c2bc8 100644 --- a/src/test/java/com/google/devtools/build/lib/packages/SkylarkSemanticsConsistencyTest.java +++ b/src/test/java/com/google/devtools/build/lib/packages/SkylarkSemanticsConsistencyTest.java @@ -120,14 +120,10 @@ public class SkylarkSemanticsConsistencyTest { return parseOptions( // <== Add new options here in alphabetic order ==> "--incompatible_bzl_disallow_load_after_statement=" + rand.nextBoolean(), - "--incompatible_checked_arithmetic=" + rand.nextBoolean(), - "--incompatible_comprehension_variables_do_not_leak=" + rand.nextBoolean(), "--incompatible_depset_is_not_iterable=" + rand.nextBoolean(), "--incompatible_depset_union=" + rand.nextBoolean(), - "--incompatible_dict_literal_has_no_duplicates=" + rand.nextBoolean(), "--incompatible_disable_glob_tracking=" + rand.nextBoolean(), "--incompatible_disallow_dict_plus=" + rand.nextBoolean(), - "--incompatible_disallow_keyword_only_args=" + rand.nextBoolean(), "--incompatible_disallow_toplevel_if_statement=" + rand.nextBoolean(), "--incompatible_disallow_uncalled_set_constructor=" + rand.nextBoolean(), "--incompatible_load_argument_is_label=" + rand.nextBoolean(), @@ -145,14 +141,10 @@ public class SkylarkSemanticsConsistencyTest { return SkylarkSemantics.builder() // <== Add new options here in alphabetic order ==> .incompatibleBzlDisallowLoadAfterStatement(rand.nextBoolean()) - .incompatibleCheckedArithmetic(rand.nextBoolean()) - .incompatibleComprehensionVariablesDoNotLeak(rand.nextBoolean()) .incompatibleDepsetIsNotIterable(rand.nextBoolean()) .incompatibleDepsetUnion(rand.nextBoolean()) - .incompatibleDictLiteralHasNoDuplicates(rand.nextBoolean()) .incompatibleDisableGlobTracking(rand.nextBoolean()) .incompatibleDisallowDictPlus(rand.nextBoolean()) - .incompatibleDisallowKeywordOnlyArgs(rand.nextBoolean()) .incompatibleDisallowToplevelIfStatement(rand.nextBoolean()) .incompatibleDisallowUncalledSetConstructor(rand.nextBoolean()) .incompatibleLoadArgumentIsLabel(rand.nextBoolean()) diff --git a/src/test/java/com/google/devtools/build/lib/syntax/EvaluationTest.java b/src/test/java/com/google/devtools/build/lib/syntax/EvaluationTest.java index 5ac5a2ff57..5ecd0e88f1 100644 --- a/src/test/java/com/google/devtools/build/lib/syntax/EvaluationTest.java +++ b/src/test/java/com/google/devtools/build/lib/syntax/EvaluationTest.java @@ -224,7 +224,7 @@ public class EvaluationTest extends EvaluationTestCase { @Test public void testCheckedArithmetic() throws Exception { - new SkylarkTest("--incompatible_checked_arithmetic=true") + new SkylarkTest() .testIfErrorContains("integer overflow", "2000000000 + 2000000000") .testIfErrorContains("integer overflow", "1234567890 * 987654321") .testIfErrorContains("integer overflow", "- 2000000000 - 2000000000") @@ -384,18 +384,12 @@ public class EvaluationTest extends EvaluationTestCase { @Test public void testDictWithDuplicatedKey() throws Exception { - new SkylarkTest("--incompatible_dict_literal_has_no_duplicates=true") + new SkylarkTest() .testIfErrorContains( "Duplicated key \"str\" when creating dictionary", "{'str': 1, 'x': 2, 'str': 3}"); } @Test - public void testDictAllowDuplicatedKey() throws Exception { - new SkylarkTest("--incompatible_dict_literal_has_no_duplicates=false") - .testStatement("{'str': 1, 'x': 2, 'str': 3}", ImmutableMap.of("str", 3, "x", 2)); - } - - @Test public void testRecursiveTupleDestructuring() throws Exception { newTest() .setUp("((a, b), (c, d)) = [(1, 2), (3, 4)]") diff --git a/src/test/java/com/google/devtools/build/lib/syntax/FunctionTest.java b/src/test/java/com/google/devtools/build/lib/syntax/FunctionTest.java index 76aebfb19f..ff8dddc596 100644 --- a/src/test/java/com/google/devtools/build/lib/syntax/FunctionTest.java +++ b/src/test/java/com/google/devtools/build/lib/syntax/FunctionTest.java @@ -300,13 +300,11 @@ public class FunctionTest extends EvaluationTestCase { @Test public void testKeywordOnlyIsForbidden() throws Exception { - env = newEnvironmentWithSkylarkOptions("--incompatible_disallow_keyword_only_args=true"); checkEvalErrorContains("forbidden", "def foo(a, b, *, c): return a + b + c"); } @Test public void testParamAfterStarArgs() throws Exception { - env = newEnvironmentWithSkylarkOptions("--incompatible_disallow_keyword_only_args=true"); checkEvalErrorContains("forbidden", "def foo(a, *b, c): return a"); } @@ -372,8 +370,7 @@ public class FunctionTest extends EvaluationTestCase { } @Test - public void testIncompatibleStarParam() throws Exception { - env = newEnvironmentWithSkylarkOptions("--incompatible_disallow_keyword_only_args=true"); + public void testStarParam() throws Exception { eval("def f(name, value = '1', optional = '2', *rest):", " r = name + value + optional + '|'", " for x in rest: r += x", diff --git a/src/test/java/com/google/devtools/build/lib/syntax/SkylarkEvaluationTest.java b/src/test/java/com/google/devtools/build/lib/syntax/SkylarkEvaluationTest.java index c234a92a57..3b7bba3488 100644 --- a/src/test/java/com/google/devtools/build/lib/syntax/SkylarkEvaluationTest.java +++ b/src/test/java/com/google/devtools/build/lib/syntax/SkylarkEvaluationTest.java @@ -1635,8 +1635,6 @@ public class SkylarkEvaluationTest extends EvaluationTest { @Test public void testListComprehensionsDoNotLeakVariables() throws Exception { - env = - newEnvironmentWithSkylarkOptions("--incompatible_comprehension_variables_do_not_leak=true"); checkEvalErrorContains( "name 'a' is not defined", "def foo():", @@ -1648,22 +1646,11 @@ public class SkylarkEvaluationTest extends EvaluationTest { @Test public void testListComprehensionsShadowGlobalVariable() throws Exception { - env = - newEnvironmentWithSkylarkOptions("--incompatible_comprehension_variables_do_not_leak=true"); eval("a = 18", "def foo():", " b = [a for a in range(3)]", " return a", "x = foo()"); assertThat(lookup("x")).isEqualTo(18); } @Test - public void testListComprehensionsLeakVariables() throws Exception { - env = - newEnvironmentWithSkylarkOptions( - "--incompatible_comprehension_variables_do_not_leak=false"); - eval("def foo():", " a = 10", " b = [a for a in range(3)]", " return a", "x = foo()"); - assertThat(lookup("x")).isEqualTo(2); - } - - @Test public void testLoadStatementWithAbsolutePath() throws Exception { env = newEnvironmentWithSkylarkOptions("--incompatible_load_argument_is_label"); checkEvalErrorContains( |