aboutsummaryrefslogtreecommitdiffstats
path: root/lib/stdlib/test
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2014-03-05 12:53:39 +0100
committerBjörn Gustavsson <[email protected]>2014-03-05 12:53:39 +0100
commitab044b52bbe0217bc06c9b67cba7099c28176ee9 (patch)
tree82ce4d9b96b6751ae857cd6c8099c9a707093ad5 /lib/stdlib/test
parent70cb25dd47ca15a79f84d3f7a92c0316cf94bd03 (diff)
parent66057b0e0c6e4a69b878090543604a7c2a59b34c (diff)
downloadotp-ab044b52bbe0217bc06c9b67cba7099c28176ee9.tar.gz
otp-ab044b52bbe0217bc06c9b67cba7099c28176ee9.tar.bz2
otp-ab044b52bbe0217bc06c9b67cba7099c28176ee9.zip
Merge branch 'nox/compiler/lint-shortcircuit-ops'
* nox/compiler/lint-shortcircuit-ops: Properly lint shortcircuiting operators
Diffstat (limited to 'lib/stdlib/test')
-rw-r--r--lib/stdlib/test/erl_lint_SUITE.erl10
1 files changed, 9 insertions, 1 deletions
diff --git a/lib/stdlib/test/erl_lint_SUITE.erl b/lib/stdlib/test/erl_lint_SUITE.erl
index 8754677466..5e117409de 100644
--- a/lib/stdlib/test/erl_lint_SUITE.erl
+++ b/lib/stdlib/test/erl_lint_SUITE.erl
@@ -1494,7 +1494,15 @@ guard(Config) when is_list(Config) ->
[],
{errors,[{1,erl_lint,illegal_guard_expr},
{2,erl_lint,illegal_guard_expr},
- {3,erl_lint,illegal_guard_expr}],[]}}
+ {3,erl_lint,illegal_guard_expr}],[]}},
+ {guard9,
+ <<"t(X, Y) when erlang:'andalso'(X, Y) -> ok;
+ t(X, Y) when erlang:'orelse'(X, Y) -> ok.
+ ">>,
+ [],
+ {errors,[{1,erl_lint,illegal_guard_expr},
+ {2,erl_lint,illegal_guard_expr}],
+ []}}
],
?line [] = run(Config, Ts1),
ok.