aboutsummaryrefslogtreecommitdiffstats
path: root/lib/compiler
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2014-01-09 12:00:45 +0100
committerBjörn Gustavsson <[email protected]>2014-01-09 12:00:45 +0100
commit31ecc95ef55de3e112fd0b5134366fccf742a92d (patch)
treed7884fb5b00a63e812633904fff811c0c5bddd2e /lib/compiler
parente086297a8638a9f57983fd707f6c75e3d4b6edf3 (diff)
parent146b9548d6d6dac3753ef6eeeebe266033c4d66a (diff)
downloadotp-31ecc95ef55de3e112fd0b5134366fccf742a92d.tar.gz
otp-31ecc95ef55de3e112fd0b5134366fccf742a92d.tar.bz2
otp-31ecc95ef55de3e112fd0b5134366fccf742a92d.zip
Merge branch 'nox/fix-dbg_ieval-exporting-rules/OTP-11553'
* nox/fix-dbg_ieval-exporting-rules/OTP-11553: compiler tests: Test exporting rules for andalso/orelse Fix evaluation of andalso and orelse in the debugger
Diffstat (limited to 'lib/compiler')
-rw-r--r--lib/compiler/test/andor_SUITE.erl6
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/compiler/test/andor_SUITE.erl b/lib/compiler/test/andor_SUITE.erl
index 4ffbe07e32..7bef0aa27c 100644
--- a/lib/compiler/test/andor_SUITE.erl
+++ b/lib/compiler/test/andor_SUITE.erl
@@ -194,6 +194,9 @@ t_andalso(Config) when is_list(Config) ->
?line false = id(false) andalso not id(glurf),
?line false = false andalso not id(glurf),
+ true = begin (X1 = true) andalso X1, X1 end,
+ false = false = begin (X2 = false) andalso X2, X2 end,
+
ok.
t_orelse(Config) when is_list(Config) ->
@@ -224,6 +227,9 @@ t_orelse(Config) when is_list(Config) ->
?line true = id(true) orelse not id(glurf),
?line true = true orelse not id(glurf),
+ true = begin (X1 = true) orelse X1, X1 end,
+ false = begin (X2 = false) orelse X2, X2 end,
+
ok.
t_andalso_1({X,Y}) ->