diff options
| author | Hans Bolinder <[email protected]> | 2016-01-13 09:45:52 +0100 |
|---|---|---|
| committer | Hans Bolinder <[email protected]> | 2016-01-13 09:45:52 +0100 |
| commit | d230f885454acbc1492f42d0f190b9d5c8eb98ec (patch) | |
| tree | 9dc803a49b398d306971e286401bec5b556e6ce7 /lib/stdlib/test | |
| parent | 0348087d57b912755c3288ec5d57b0d82a51874b (diff) | |
| parent | 72d6687a6514c6cd2e0af5b67760b5f83f62915c (diff) | |
| download | otp-d230f885454acbc1492f42d0f190b9d5c8eb98ec.tar.gz otp-d230f885454acbc1492f42d0f190b9d5c8eb98ec.tar.bz2 otp-d230f885454acbc1492f42d0f190b9d5c8eb98ec.zip | |
Merge branch 'maint'
* maint:
stdlib: Fix linter crash due to missing -module declaration
Conflicts:
lib/stdlib/test/erl_lint_SUITE.erl
Diffstat (limited to 'lib/stdlib/test')
| -rw-r--r-- | lib/stdlib/test/erl_lint_SUITE.erl | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/lib/stdlib/test/erl_lint_SUITE.erl b/lib/stdlib/test/erl_lint_SUITE.erl index 3c746a13d7..c5e2e5609d 100644 --- a/lib/stdlib/test/erl_lint_SUITE.erl +++ b/lib/stdlib/test/erl_lint_SUITE.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1999-2015. All Rights Reserved. +%% Copyright Ericsson AB 1999-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -65,7 +65,7 @@ too_many_arguments/1, basic_errors/1,bin_syntax_errors/1, predef/1, - maps/1,maps_type/1,otp_11851/1,otp_11879/1 + maps/1,maps_type/1,otp_11851/1,otp_11879/1,otp_13230/1 ]). % Default timetrap timeout (set in init_per_testcase). @@ -94,7 +94,7 @@ all() -> bif_clash, behaviour_basic, behaviour_multiple, otp_11861, otp_7550, otp_8051, format_warn, {group, on_load}, too_many_arguments, basic_errors, bin_syntax_errors, predef, - maps, maps_type, otp_11851, otp_11879]. + maps, maps_type, otp_11851, otp_11879, otp_13230]. groups() -> [{unused_vars_warn, [], @@ -3872,6 +3872,15 @@ otp_11879(_Config) -> []} = compile:forms(Fs, [return,report]), ok. +otp_13230(doc) -> + "OTP-13230: -deprecated without -module"; +otp_13230(Config) when is_list(Config) -> + Abstr = <<"-deprecated([{frutt,0,next_version}]).">>, + {errors,[{1,erl_lint,undefined_module}, + {1,erl_lint,{bad_deprecated,{frutt,0}}}], + []} = run_test2(Config, Abstr, []), + ok. + run(Config, Tests) -> F = fun({N,P,Ws,E}, BadL) -> case catch run_test(Config, P, Ws) of |