Add beam_bool_SUITE

It's time that we have a dedicated test suite for beam_bool.

4 files changed, 136 insertions, 84 deletions

diff --git a/lib/compiler/test/Makefile b/lib/compiler/test/Makefile
index 85118502e3..203a50db55 100644
--- a/lib/compiler/test/Makefile
+++ b/lib/compiler/test/Makefile
@@ -9,6 +9,7 @@ MODULES= \
 	andor_SUITE \
 	apply_SUITE \
 	beam_block_SUITE \
+	beam_bool_SUITE \
 	beam_validator_SUITE \
 	beam_disasm_SUITE \
 	beam_except_SUITE \
@@ -46,6 +47,7 @@ NO_OPT= \
 	andor \
 	apply \
 	beam_block \
+	beam_bool \
 	beam_except \
 	beam_reorder \
 	beam_type \
@@ -70,6 +72,7 @@ INLINE= \
 	andor \
 	apply \
 	beam_block \
+	beam_bool \
 	beam_utils \
 	bs_bincomp \
 	bs_bit_binaries \
diff --git a/lib/compiler/test/andor_SUITE.erl b/lib/compiler/test/andor_SUITE.erl
index fa1cedbe02..05c087104d 100644
--- a/lib/compiler/test/andor_SUITE.erl
+++ b/lib/compiler/test/andor_SUITE.erl
@@ -22,8 +22,7 @@
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
 	 init_per_group/2,end_per_group/2,
 	 t_case/1,t_and_or/1,t_andalso/1,t_orelse/1,inside/1,overlap/1,
-	 combined/1,in_case/1,before_and_inside_if/1,
-	 slow_compilation/1]).
+	 combined/1,in_case/1,slow_compilation/1]).
 	 
 -include_lib("common_test/include/ct.hrl").
 
@@ -36,7 +35,7 @@ all() ->
 groups() -> 
     [{p,[parallel],
       [t_case,t_and_or,t_andalso,t_orelse,inside,overlap,
-       combined,in_case,before_and_inside_if,slow_compilation]}].
+       combined,in_case,slow_compilation]}].
 
 init_per_suite(Config) ->
     Config.
@@ -450,64 +449,6 @@ in_case_1_guard(LenUp, LenDw, LenN, Rotation, Count) ->
 	false -> loop
     end.
 
-before_and_inside_if(Config) when is_list(Config) ->
-    no = before_and_inside_if([a], [b], delete),
-    no = before_and_inside_if([a], [b], x),
-    no = before_and_inside_if([a], [], delete),
-    no = before_and_inside_if([a], [], x),
-    no = before_and_inside_if([], [], delete),
-    yes = before_and_inside_if([], [], x),
-    yes = before_and_inside_if([], [b], delete),
-    yes = before_and_inside_if([], [b], x),
-
-    {ch1,ch2} = before_and_inside_if_2([a], [b], blah),
-    {ch1,ch2} = before_and_inside_if_2([a], [b], xx),
-    {ch1,ch2} = before_and_inside_if_2([a], [], blah),
-    {ch1,ch2} = before_and_inside_if_2([a], [], xx),
-    {no,no} = before_and_inside_if_2([], [b], blah),
-    {no,no} = before_and_inside_if_2([], [b], xx),
-    {ch1,no} = before_and_inside_if_2([], [], blah),
-    {no,ch2} = before_and_inside_if_2([], [], xx),
-    ok.
-
-%% Thanks to Simon Cornish and Kostis Sagonas.
-%% Used to crash beam_bool.
-before_and_inside_if(XDo1, XDo2, Do3) ->
-    Do1 = (XDo1 =/= []),
-    Do2 = (XDo2 =/= []),
-    if
-	%% This expression occurs in a try/catch (protected)
-	%% block, which cannot refer to variables outside of
-	%% the block that are boolean expressions.
-	Do1 =:= true;
-	Do1 =:= false, Do2 =:= false, Do3 =:= delete ->
-	    no;
-       true ->
-	    yes
-    end.
-
-%% Thanks to Simon Cornish.
-%% Used to generate code that would not set {y,0} on
-%% all paths before its use (and therefore fail
-%% validation by the beam_validator).
-before_and_inside_if_2(XDo1, XDo2, Do3) ->
-    Do1    = (XDo1 =/= []),
-    Do2    = (XDo2 =/= []),
-    CH1 = if Do1 == true;
-	     Do1 == false,Do2==false,Do3 == blah ->
-		  ch1;
-	     true ->
-		  no
-	  end,
-    CH2 = if Do1 == true;
-	     Do1 == false,Do2==false,Do3 == xx ->
-		  ch2;
-	     true ->
-		  no
-	  end,
-    {CH1,CH2}.
-
-
 -record(state, {stack = []}).
 
 slow_compilation(_) ->
diff --git a/lib/compiler/test/beam_bool_SUITE.erl b/lib/compiler/test/beam_bool_SUITE.erl
new file mode 100644
index 0000000000..413d03b0ff
--- /dev/null
+++ b/lib/compiler/test/beam_bool_SUITE.erl
@@ -0,0 +1,129 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2015-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.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%%
+%% %CopyrightEnd%
+%%
+-module(beam_bool_SUITE).
+
+-export([all/0,suite/0,groups/0,init_per_suite/1,end_per_suite/1,
+	 init_per_group/2,end_per_group/2,
+	 before_and_inside_if/1,
+	 scotland/1]).
+
+suite() ->
+    [{ct_hooks,[ts_install_cth]}].
+
+all() ->
+    test_lib:recompile(?MODULE),
+    [{group,p}].
+
+groups() ->
+    [{p,[parallel],
+      [before_and_inside_if,
+       scotland
+      ]}].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+before_and_inside_if(_Config) ->
+    no = before_and_inside_if([a], [b], delete),
+    no = before_and_inside_if([a], [b], x),
+    no = before_and_inside_if([a], [], delete),
+    no = before_and_inside_if([a], [], x),
+    no = before_and_inside_if([], [], delete),
+    yes = before_and_inside_if([], [], x),
+    yes = before_and_inside_if([], [b], delete),
+    yes = before_and_inside_if([], [b], x),
+
+    {ch1,ch2} = before_and_inside_if_2([a], [b], blah),
+    {ch1,ch2} = before_and_inside_if_2([a], [b], xx),
+    {ch1,ch2} = before_and_inside_if_2([a], [], blah),
+    {ch1,ch2} = before_and_inside_if_2([a], [], xx),
+    {no,no} = before_and_inside_if_2([], [b], blah),
+    {no,no} = before_and_inside_if_2([], [b], xx),
+    {ch1,no} = before_and_inside_if_2([], [], blah),
+    {no,ch2} = before_and_inside_if_2([], [], xx),
+    ok.
+
+%% Thanks to Simon Cornish and Kostis Sagonas.
+%% Used to crash beam_bool.
+before_and_inside_if(XDo1, XDo2, Do3) ->
+    Do1 = (XDo1 =/= []),
+    Do2 = (XDo2 =/= []),
+    if
+	%% This expression occurs in a try/catch (protected)
+	%% block, which cannot refer to variables outside of
+	%% the block that are boolean expressions.
+	Do1 =:= true;
+	Do1 =:= false, Do2 =:= false, Do3 =:= delete ->
+	    no;
+       true ->
+	    yes
+    end.
+
+%% Thanks to Simon Cornish.
+%% Used to generate code that would not set {y,0} on
+%% all paths before its use (and therefore fail
+%% validation by the beam_validator).
+before_and_inside_if_2(XDo1, XDo2, Do3) ->
+    Do1    = (XDo1 =/= []),
+    Do2    = (XDo2 =/= []),
+    CH1 = if Do1 == true;
+	     Do1 == false,Do2==false,Do3 == blah ->
+		  ch1;
+	     true ->
+		  no
+	  end,
+    CH2 = if Do1 == true;
+	     Do1 == false,Do2==false,Do3 == xx ->
+		  ch2;
+	     true ->
+		  no
+	  end,
+    {CH1,CH2}.
+
+
+%% beam_bool would remove the initialization of {y,0}.
+%% (Thanks to Thomas Arts and QuickCheck.)
+
+scotland(_Config) ->
+    million = do_scotland(placed),
+    {'EXIT',{{badmatch,placed},_}} = (catch do_scotland(false)),
+    {'EXIT',{{badmatch,placed},_}} = (catch do_scotland(true)),
+    {'EXIT',{{badmatch,placed},_}} = (catch do_scotland(echo)),
+    ok.
+
+do_scotland(Echo) ->
+  found(case Echo of
+	    Echo when true; Echo, Echo, Echo ->
+		Echo;
+	    echo ->
+		[]
+	end,
+	Echo = placed).
+
+found(_, _) -> million.
diff --git a/lib/compiler/test/guard_SUITE.erl b/lib/compiler/test/guard_SUITE.erl
index 13d274d98a..83298e546e 100644
--- a/lib/compiler/test/guard_SUITE.erl
+++ b/lib/compiler/test/guard_SUITE.erl
@@ -34,7 +34,7 @@
 	 tricky/1,rel_ops/1,rel_op_combinations/1,literal_type_tests/1,
 	 basic_andalso_orelse/1,traverse_dcd/1,
 	 check_qlc_hrl/1,andalso_semi/1,t_tuple_size/1,binary_part/1,
-	 bad_constants/1,bad_guards/1,scotland/1,
+	 bad_constants/1,bad_guards/1,
 	 guard_in_catch/1]).
 
 suite() -> [{ct_hooks,[ts_install_cth]}].
@@ -54,7 +54,7 @@ groups() ->
        rel_ops,rel_op_combinations,
        literal_type_tests,basic_andalso_orelse,traverse_dcd,
        check_qlc_hrl,andalso_semi,t_tuple_size,binary_part,
-       bad_constants,bad_guards,scotland,guard_in_catch]}].
+       bad_constants,bad_guards,guard_in_catch]}].
 
 init_per_suite(Config) ->
     Config.
@@ -1852,27 +1852,6 @@ bad_guards_2(M, [_]) when M#{a := 0, b => 0}, map_size(M) ->
 bad_guards_3(M, [_]) when is_map(M) andalso M#{a := 0, b => 0}, length(M) ->
     ok.
 
-%% beam_bool would remove the initialization of {y,0}.
-%% (Thanks to Thomas Arts and QuickCheck.)
-
-scotland(_Config) ->
-    million = do_scotland(placed),
-    {'EXIT',{{badmatch,placed},_}} = (catch do_scotland(false)),
-    {'EXIT',{{badmatch,placed},_}} = (catch do_scotland(true)),
-    {'EXIT',{{badmatch,placed},_}} = (catch do_scotland(echo)),
-    ok.
-
-do_scotland(Echo) ->
-  found(case Echo of
-	    Echo when true; Echo, Echo, Echo ->
-		Echo;
-	    echo ->
-		[]
-	end,
-	Echo = placed).
-
-found(_, _) -> million.
-
 %% Building maps in a guard in a 'catch' would crash v3_codegen.
 
 guard_in_catch(_Config) ->