diff options
| author | Björn Gustavsson <[email protected]> | 2012-08-15 11:11:09 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2012-08-15 11:11:09 +0200 |
| commit | 70e8c948bd762aa9e5413092d8c993e56197d69a (patch) | |
| tree | f26311047c6fda74e5296ea6c25b1fb49f0f7b46 /lib/stdlib/test/erl_lint_SUITE.erl | |
| parent | 160bf5da0e03f39b468ebba5d39d1658c8a370e6 (diff) | |
| parent | c5e5cf792d87e0d23f80ff572f499f0e3e044933 (diff) | |
| download | otp-70e8c948bd762aa9e5413092d8c993e56197d69a.tar.gz otp-70e8c948bd762aa9e5413092d8c993e56197d69a.tar.bz2 otp-70e8c948bd762aa9e5413092d8c993e56197d69a.zip | |
Merge branch 'maint'
* maint:
erl_lint: Add a deprecated warning for literal tuple funs
beam_utils:live_opt/1: Correct handling of try_case_end/1
Correct guard_SUITE_tuple_size.S
beam_type: Print the offending function if this pass crashes
beam_validator: Validate the size operand in bs_init_bits and bs_init2
Diffstat (limited to 'lib/stdlib/test/erl_lint_SUITE.erl')
| -rw-r--r-- | lib/stdlib/test/erl_lint_SUITE.erl | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/lib/stdlib/test/erl_lint_SUITE.erl b/lib/stdlib/test/erl_lint_SUITE.erl index dcd622b984..9f9d97b619 100644 --- a/lib/stdlib/test/erl_lint_SUITE.erl +++ b/lib/stdlib/test/erl_lint_SUITE.erl @@ -1331,17 +1331,20 @@ guard(Config) when is_list(Config) -> foo. ">>, [warn_unused_vars, nowarn_obsolete_guard], - {errors,[{2,erl_lint,illegal_guard_expr}, - {4,erl_lint,illegal_guard_expr}, - {6,erl_lint,illegal_guard_expr}, - {8,erl_lint,illegal_guard_expr}, - {10,erl_lint,illegal_guard_expr}, - {12,erl_lint,illegal_guard_expr}, - {14,erl_lint,illegal_guard_expr}, - {16,erl_lint,illegal_guard_expr}, - {18,erl_lint,illegal_guard_expr}, - {20,erl_lint,illegal_guard_expr}], - []}}, + {error,[{2,erl_lint,illegal_guard_expr}, + {4,erl_lint,illegal_guard_expr}, + {6,erl_lint,illegal_guard_expr}, + {8,erl_lint,illegal_guard_expr}, + {10,erl_lint,illegal_guard_expr}, + {12,erl_lint,illegal_guard_expr}, + {14,erl_lint,illegal_guard_expr}, + {16,erl_lint,illegal_guard_expr}, + {18,erl_lint,illegal_guard_expr}, + {20,erl_lint,illegal_guard_expr}], + [{8,erl_lint,deprecated_tuple_fun}, + {14,erl_lint,deprecated_tuple_fun}, + {20,erl_lint,deprecated_tuple_fun}, + {28,erl_lint,deprecated_tuple_fun}]}}, {guard6, <<"-record(apa,{a=a,b=foo:bar()}). apa() -> |