Move pattern-matching tests to match_SUITE

8 files changed, 59 insertions, 224 deletions

diff --git a/lib/compiler/test/compilation_SUITE.erl b/lib/compiler/test/compilation_SUITE.erl
index 39174f64d1..2d62c09883 100644
--- a/lib/compiler/test/compilation_SUITE.erl
+++ b/lib/compiler/test/compilation_SUITE.erl
@@ -37,15 +37,14 @@ groups() ->
     [{vsn,[parallel],[vsn_1,vsn_2,vsn_3]},
      {p,test_lib:parallel(),
       [compiler_1,
-       beam_compiler_3,beam_compiler_4,
-       beam_compiler_5,beam_compiler_6,beam_compiler_7,
+       beam_compiler_4,beam_compiler_6,beam_compiler_7,
        beam_compiler_8,beam_compiler_9,beam_compiler_10,
-       beam_compiler_11,beam_compiler_12,
-       nested_tuples_in_case_expr,otp_2330,
+       beam_compiler_11,
+       otp_2330,
        {group,vsn},otp_2380,otp_4790,
        const_list_256,live_var,convopts,
        catch_in_catch,redundant_case,long_string,otp_5076,
-       otp_5092,otp_5151,otp_5235,otp_5244,
+       otp_5092,otp_5151,otp_5235,
        trycatch_4,opt_crash,otp_5404,otp_5436,otp_5481,
        otp_5553,otp_5632,otp_5714,otp_5872,otp_6121,
        otp_6121a,otp_6121b,otp_7202,otp_7345,on_load,
@@ -72,28 +71,19 @@ end_per_group(_GroupName, Config) ->
 ?comp(compiler_1).
 ?comp(compiler_4).
 
-?comp(beam_compiler_3).
 ?comp(beam_compiler_4).
-?comp(beam_compiler_5).
 ?comp(beam_compiler_6).
 ?comp(beam_compiler_8).
 ?comp(beam_compiler_9).
 ?comp(beam_compiler_10).
 ?comp(beam_compiler_11).
-?comp(beam_compiler_12).
 ?comp(beam_compiler_13).
 
-?comp(nested_tuples_in_case_expr).
-
 ?comp(otp_2330).
 ?comp(otp_2380).
 ?comp(otp_4790).
 ?comp(otp_5235).
 
-?comp(otp_5244).
-
-?comp(pattern_expr).
-
 ?comp(const_list_256).
 
 ?comp(otp_5076).
diff --git a/lib/compiler/test/compilation_SUITE_data/beam_compiler_12.erl b/lib/compiler/test/compilation_SUITE_data/beam_compiler_12.erl
deleted file mode 100644
index d34291159a..0000000000
--- a/lib/compiler/test/compilation_SUITE_data/beam_compiler_12.erl
+++ /dev/null
@@ -1,30 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2000-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_compiler_12).
-
--export([?MODULE/0,t/1]).
-
-?MODULE() ->
-    ok.
-
-t(Name) ->
-    {ok = {file_info,_,regular,_,AccTime1,ModTime1,_,_,_,_,_,_,_,_}} =
-	prim_file:read_file_info(Name).
-
diff --git a/lib/compiler/test/compilation_SUITE_data/beam_compiler_3.erl b/lib/compiler/test/compilation_SUITE_data/beam_compiler_3.erl
deleted file mode 100644
index bdc4ec06e5..0000000000
--- a/lib/compiler/test/compilation_SUITE_data/beam_compiler_3.erl
+++ /dev/null
@@ -1,30 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1997-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_compiler_3).
--export([beam_compiler_3/0, f/0]).
-
-%% From Ulf Wiger.
-
-beam_compiler_3() ->
-    ok.
-
-f() ->
-    [_|T] = lists:reverse("xxx"),
-    T.
diff --git a/lib/compiler/test/compilation_SUITE_data/beam_compiler_5.erl b/lib/compiler/test/compilation_SUITE_data/beam_compiler_5.erl
deleted file mode 100644
index 7289d2b553..0000000000
--- a/lib/compiler/test/compilation_SUITE_data/beam_compiler_5.erl
+++ /dev/null
@@ -1,29 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1997-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_compiler_5).
--export([beam_compiler_5/0]).
-
--compile(export_all).
-
-beam_compiler_5() ->
-    ok.
-
-t() ->
-    [_|_] = x.
diff --git a/lib/compiler/test/compilation_SUITE_data/nested_tuples_in_case_expr.erl b/lib/compiler/test/compilation_SUITE_data/nested_tuples_in_case_expr.erl
deleted file mode 100644
index bbacb7cf14..0000000000
--- a/lib/compiler/test/compilation_SUITE_data/nested_tuples_in_case_expr.erl
+++ /dev/null
@@ -1,37 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2001-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(nested_tuples_in_case_expr).
--export([nested_tuples_in_case_expr/0,t/2]).
-
-nested_tuples_in_case_expr() ->
-    ok.
-
-t(A, B) ->
-    case {{element(1, A),element(2, B)},{element(2, A),element(2, B)}} of
-	{Same,Same} -> ok;
-	{{0,1},{up,X}} -> bar(X);
-	{_,{X,_}} -> bar(X)
-    end.
-
-bar(X) -> X.
-
-    
-    
-	    
diff --git a/lib/compiler/test/compilation_SUITE_data/otp_5244.erl b/lib/compiler/test/compilation_SUITE_data/otp_5244.erl
deleted file mode 100644
index 8144e5a225..0000000000
--- a/lib/compiler/test/compilation_SUITE_data/otp_5244.erl
+++ /dev/null
@@ -1,48 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2004-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(otp_5244).
--export([?MODULE/0]).
-
-?MODULE() ->
-    L = [{stretch,0,0},
-	 {bad,[]},
-	 {bad,atom},
-	 {bad,0},
-	 {bad,16#AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA},
-	 {bad,16#555555555555555555555555555555555555555555555555555}],
-    remove_failure(L, unit, 0).
-
-remove_failure([], _Unit, _MaxFailure) ->
-    ok;
-remove_failure([{bad,Bad}|_], _Unit, _MaxFailure) ->
-    Bad;
-remove_failure([{stretch,_,Mi}=Stretch | Specs], Unit, _MaxFailure) ->
-    {MinMax,NewMaxFailure} = max_failure(),
-    case {MinMax,remove_failure(Specs, Unit, NewMaxFailure)} of
-	{min,{NewMaxFailure,Rest}} ->
-	    {done,[{fixed,Mi} | Rest]};
-	{min,_} when Specs =/= [] ->
-	    remove_failure([Stretch|tl(Specs)], Unit, NewMaxFailure);
-	{min,_} ->
-	    ok
-    end.
-
-max_failure() ->
-    {min,1}.
diff --git a/lib/compiler/test/compilation_SUITE_data/pattern_expr.erl b/lib/compiler/test/compilation_SUITE_data/pattern_expr.erl
deleted file mode 100644
index a78b3501d1..0000000000
--- a/lib/compiler/test/compilation_SUITE_data/pattern_expr.erl
+++ /dev/null
@@ -1,31 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% 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.
-%% 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(pattern_expr).
-
--export(pattern_expr/0).
-
-pattern_expr() ->
-    f().
-
-f() ->
-    case 4 of
-	2+2 ->
-	    ok
-    end.
diff --git a/lib/compiler/test/match_SUITE.erl b/lib/compiler/test/match_SUITE.erl
index f6a24b3211..45d84a7b80 100644
--- a/lib/compiler/test/match_SUITE.erl
+++ b/lib/compiler/test/match_SUITE.erl
@@ -24,7 +24,7 @@
 	 pmatch/1,mixed/1,aliases/1,match_in_call/1,
 	 untuplify/1,shortcut_boolean/1,letify_guard/1,
 	 selectify/1,underscore/1,match_map/1,map_vars_used/1,
-      coverage/1]).
+	 coverage/1,grab_bag/1]).
 	 
 -include_lib("common_test/include/ct.hrl").
 
@@ -38,7 +38,8 @@ groups() ->
     [{p,[parallel],
       [pmatch,mixed,aliases,match_in_call,untuplify,
        shortcut_boolean,letify_guard,selectify,
-       underscore,match_map,map_vars_used,coverage]}].
+       underscore,match_map,map_vars_used,coverage,
+       grab_bag]}].
 
 
 init_per_suite(Config) ->
@@ -93,9 +94,9 @@ mixit(X) ->
 	     2 -> b;
 	     3 -> 42;
 	     4 -> 77;
-	     5 -> blurf;
-	     6 -> 87987987;
-	     7 -> {a,b,c}
+	     4+1 -> blurf;
+	     5+1 -> 87987987;
+	     6+1 -> {a,b,c}
 	 end of
 	a -> glufs;
 	b -> klafs;
@@ -465,4 +466,53 @@ coverage_2(2, b, x) -> ok.
 
 coverage_3([$a]++[]++"bc") -> ok.
 
+grab_bag(_Config) ->
+    [_|T] = id([a,b,c]),
+    [b,c] = id(T),
+
+    T1 = fun() ->
+		 [_|_] = x
+	 end,
+    {'EXIT',_} = (catch T1()),
+
+    T2 = fun(A, B) ->
+		 case {{element(1, A),element(2, B)},
+		       {element(2, A),element(2, B)}} of
+		     {Same,Same} -> ok;
+		     {{0,1},{up,X}} -> id(X);
+		     {_,{X,_}} -> id(X)
+		 end
+	 end,
+    ok = T2({a,a,z,z}, {z,a,z}),
+    1 = T2({0,up}, {zzz,1}),
+    y = T2({x,y}, {a,z,z}),
+
+    %% OTP-5244.
+    L = [{stretch,0,0},
+	 {bad,[]},
+	 {bad,atom},
+	 {bad,0},
+	 {bad,16#AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA},
+	 {bad,16#555555555555555555555555555555555555555555555555555}],
+    ok = grab_bag_remove_failure(L, unit, 0),
+
+    ok.
+
+grab_bag_remove_failure([], _Unit, _MaxFailure) ->
+    ok;
+grab_bag_remove_failure([{bad,Bad}|_], _Unit, _MaxFailure) ->
+    Bad;
+grab_bag_remove_failure([{stretch,_,Mi}=Stretch | Specs], Unit, _MaxFailure) ->
+    {MinMax,NewMaxFailure} = id({min,1}),
+    case {MinMax,grab_bag_remove_failure(Specs, Unit, NewMaxFailure)} of
+	{min,{NewMaxFailure,Rest}} ->
+	    {done,[{fixed,Mi} | Rest]};
+	{min,_} when Specs =/= [] ->
+	    grab_bag_remove_failure([Stretch|tl(Specs)], Unit, NewMaxFailure);
+	{min,_} ->
+	    ok
+    end.
+
+
+
 id(I) -> I.