File 1090-stdlib-Add-error_info-test-for-multiple-me... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 1090-stdlib-Add-error_info-test-for-multiple-messages.patch of Package erlang (Revision c60a113e1eaed31d142b913626c9a44a)

Currently displaying revision c60a113e1eaed31d142b913626c9a44a , Show latest

From af973e0a8338c2d1832e2ddf09dcafe84899ff0f Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas@erlang.org>
Date: Fri, 23 Apr 2021 14:55:55 +0200
Subject: [PATCH 10/13] stdlib: Add error_info test for multiple messages

Add so that the error_info_lib tests that only a single
error info message is printed per argument.
---
 lib/stdlib/test/binary_module_SUITE.erl | 26 +++++++++++------------
 lib/stdlib/test/error_info_lib.erl      |  7 +++++--
 lib/stdlib/test/lists_SUITE.erl         |  6 +++---
 lib/stdlib/test/maps_SUITE.erl          | 10 ++++-----
 lib/stdlib/test/math_SUITE.erl          |  6 +++---
 lib/stdlib/test/re_SUITE.erl            | 28 ++++++++++++-------------
 lib/stdlib/test/unicode_SUITE.erl       |  4 ++--
 7 files changed, 45 insertions(+), 42 deletions(-)

diff --git a/lib/stdlib/test/binary_module_SUITE.erl b/lib/stdlib/test/binary_module_SUITE.erl
index 70e100c9e6..4ee0b771c0 100644
--- a/lib/stdlib/test/binary_module_SUITE.erl
+++ b/lib/stdlib/test/binary_module_SUITE.erl
@@ -1379,25 +1379,25 @@ check_no_invalid_read_bug(I) ->
     check_no_invalid_read_bug(I+1).
 
 error_info(_Config) ->
-    L = [{at, [[no,binary], bad_pos]},
-         {at, [<<77:7>>, -1]},
+    L = [{at, [[no,binary], bad_pos],[{1,".*"},{2,".*"}]},
+         {at, [<<77:7>>, -1],[{1,".*"},{2,".*"}]},
 
          {bin_to_list, [{no,binary}]},
          {bin_to_list, [<<1:1>>]},
 
-         {bin_to_list,[<<3:3>>, bad_pos_len]},
+         {bin_to_list,[<<3:3>>, bad_pos_len],[{1,".*"},{2,".*"}]},
          {bin_to_list,[<<"abc">>, {0, 99}]},
 
          {bin_to_list,[<<1,2,3>>, {1,4}]},
          {bin_to_list,[<<1,2,3>>, 1, 4]},
-         {bin_to_list,[<<1,2,3>>, a, b]},
+         {bin_to_list,[<<1,2,3>>, a, b],[{2,".*"},{3,".*"}]},
          {bin_to_list,[<<1,2,3>>, a, 0]},
          {bin_to_list,[<<1,2,3>>, 1, -10]},
 
          {compile_pattern,[42]},
          {copy,[no_binary]},
-         {copy,[no_binary,-42]},
-         {copy,[<<1:1>>,no_integer]},
+         {copy,[no_binary,-42],[{1,".*"},{2,".*"}]},
+         {copy,[<<1:1>>,no_integer],[{1,".*"},{2,".*"}]},
 
          {decode_unsigned,[<<1:1>>]},
          {decode_unsigned,[<<0,42>>, middle]},
@@ -1418,15 +1418,15 @@ error_info(_Config) ->
          {longest_common_prefix, [abc]},
          {longest_common_suffix, [abc]},
 
-         {match, [<<1:1>>, {bm,make_ref()}]},
-         {match, [<<1:1>>, no_pattern]},
+         {match, [<<1:1>>, {bm,make_ref()}],[{1,".*"},{2,".*"}]},
+         {match, [<<1:1>>, no_pattern],[{1,".*"},{2,".*"}]},
          {match, [<<"abc">>, no_pattern]},
 
          {match, [<<"abc">>, <<"a">>, [{scope,{2,-8}}]]},
          {match, [<<"abc">>, <<"a">>, [bad_option]]},
 
-         {matches,[<<1:1>>, {bm,make_ref()}]},
-         {matches,[<<1:1>>, no_pattern]},
+         {matches,[<<1:1>>, {bm,make_ref()}],[{1,".*"},{2,".*"}]},
+         {matches,[<<1:1>>, no_pattern],[{1,".*"},{2,".*"}]},
          {matches,[<<"abc">>, no_pattern]},
 
          {matches, [<<"abc">>, <<"a">>, [{scope,{0,-1}}]]},
@@ -1435,12 +1435,12 @@ error_info(_Config) ->
          {bin_to_list, [{no,binary}]},
          {bin_to_list, [<<1:1>>]},
 
-         {part, [<<3:3>>, bad_pos_len]},
+         {part, [<<3:3>>, bad_pos_len],[{1,".*"},{2,".*"}]},
          {part, [<<"abc">>, {0, 99}]},
 
          {part, [<<1,2,3>>, {1,4}]},
          {part, [<<1,2,3>>, 1, 4]},
-         {part, [<<1,2,3>>, a, b]},
+         {part, [<<1,2,3>>, a, b],[{2,".*"},{3,".*"}]},
          {part, [<<1,2,3>>, a, 0]},
          {part, [<<1,2,3>>, 1, -10]},
 
@@ -1453,7 +1453,7 @@ error_info(_Config) ->
          {replace, [<<"xyz">>, <<"x">>, <<1:1>>, []]},
          {replace, [<<"xyz",1:1>>, <<"x">>, <<"y">>, []]},
          {replace, [<<"xyz">>, {bm,make_ref()}, <<"y">>, []]},
-         {replace, [<<"xyz",1:1>>, <<"x">>, <<"y">>, [bad_option]]},
+         {replace, [<<"xyz",1:1>>, <<"x">>, <<"y">>, [bad_option]],[{1,".*"},{4,".*"}]},
 
          {split, [<<1:15>>, <<"a">>]},
          {split, [<<1,2,3>>, {bm,make_ref()}]},
diff --git a/lib/stdlib/test/error_info_lib.erl b/lib/stdlib/test/error_info_lib.erl
index 83470a291b..81c0cbfc2e 100644
--- a/lib/stdlib/test/error_info_lib.erl
+++ b/lib/stdlib/test/error_info_lib.erl
@@ -108,9 +108,12 @@ eval_bif_error(F, Args, Opts, T, Module, Errors0) ->
                             false ->
                                 lists:foldl(
                                   fun(Match, Errors) ->
-                                          case re:run(BinStr, Match, [{capture, none}]) of
-                                              match ->
+                                          case re:run(BinStr, Match, [global]) of
+                                              {match,[_]} ->
                                                   Errors;
+                                              {match,_} ->
+                                                  [{too_many_explanations,{F,Args},
+                                                    Info,BinStr,lists:flatten(Match)}|Errors];
                                               nomatch ->
                                                   [{no_explanation,{F,Args},
                                                     Info,BinStr,lists:flatten(Match)}|Errors]
diff --git a/lib/stdlib/test/lists_SUITE.erl b/lib/stdlib/test/lists_SUITE.erl
index cb52fed9a0..5a9d72e0e3 100644
--- a/lib/stdlib/test/lists_SUITE.erl
+++ b/lib/stdlib/test/lists_SUITE.erl
@@ -2744,9 +2744,9 @@ hof(Config) when is_list(Config) ->
     ok.
 
 error_info(_Config) ->
-    L = [{keyfind, [whatever, bad_position, bad_list]},
-         {keymember, [key, 0, bad_list]},
-         {keysearch, [key, bad_position, {no,list}]},
+    L = [{keyfind, [whatever, bad_position, bad_list], [{2,".*"},{3,".*"}]},
+         {keymember, [key, 0, bad_list], [{2,".*"}, {3,".*"}]},
+         {keysearch, [key, bad_position, {no,list}], [{2,".*"}, {3,".*"}]},
          {member, [whatever, not_a_list]},
          {member, [whatever, [a|b]]},
          {reverse, [not_a_list, whatever]}
diff --git a/lib/stdlib/test/maps_SUITE.erl b/lib/stdlib/test/maps_SUITE.erl
index 4860e39b70..36a8804e81 100644
--- a/lib/stdlib/test/maps_SUITE.erl
+++ b/lib/stdlib/test/maps_SUITE.erl
@@ -776,7 +776,7 @@ error_info(_Config) ->
 
     L = [{filter, [fun(_, _) -> true end, abc]},
          {filter, [fun(_, _) -> true end, BadIterator]},
-         {filter, [bad_fun, BadIterator]},
+         {filter, [bad_fun, BadIterator],[{1,".*"},{2,".*"}]},
          {filter, [bad_fun, GoodIterator]},
 
          {filtermap, [fun(_, _) -> true end, abc]},
@@ -807,11 +807,11 @@ error_info(_Config) ->
 
          {intersect, [#{a => b}, y]},
          {intersect, [x, #{a => b}]},
-         {intersect, [x, y]},
+         {intersect, [x, y],[{1,".*"},{2,".*"}]},
 
          {intersect_with, [fun(_, _, _) -> ok end, #{a => b}, y]},
          {intersect_with, [fun(_, _, _) -> ok end, x, #{a => b}]},
-         {intersect_with, [fun(_, _, _) -> ok end, x, y]},
+         {intersect_with, [fun(_, _, _) -> ok end, x, y],[{2,".*"},{3,".*"}]},
          {intersect_with, [fun(_, _) -> ok end, #{}, #{}]},
 
          {is_key,[key, no_map]},
@@ -827,10 +827,10 @@ error_info(_Config) ->
 
          {merge,[#{a => b}, {a,b}]},
          {merge,[{x,y}, #{a => b}]},
-         {merge,[{x,y}, {a,b}]},
+         {merge,[{x,y}, {a,b}],[{1,".*"},{2,".*"}]},
 
          {merge_with, [fun(_, _) -> ok end, #{}, #{}]},
-         {merge_with, [a, b, c]},
+         {merge_with, [a, b, c],[{1,".*"},{2,".*"},{3,".*"}]},
 
          {next,[no_iterator]},
 
diff --git a/lib/stdlib/test/math_SUITE.erl b/lib/stdlib/test/math_SUITE.erl
index fa4faed871..786b9941fb 100644
--- a/lib/stdlib/test/math_SUITE.erl
+++ b/lib/stdlib/test/math_SUITE.erl
@@ -113,7 +113,7 @@ error_info(_Config) ->
           {asin, [999]},
 
           {atan, [a]},
-          {atan2, [a, b]},
+          {atan2, [a, b],[{1,".*"},{2,".*"}]},
 
           {cos, [a]},
           {sin, [a]},
@@ -137,11 +137,11 @@ error_info(_Config) ->
           {exp, [a]},
           {floor, [a]},
 
-          {fmod, [a, b]},
+          {fmod, [a, b],[{1,".*"},{2,".*"}]},
           {fmod, [a, 1]},
           {fmod, [1, 0]},
 
-          {pow, [a, b]},
+          {pow, [a, b],[{1,".*"},{2,".*"}]},
 
           {sqrt, [a]},
           {sqrt, [-1]},
diff --git a/lib/stdlib/test/re_SUITE.erl b/lib/stdlib/test/re_SUITE.erl
index 3d5761aa40..3b6e63d82f 100644
--- a/lib/stdlib/test/re_SUITE.erl
+++ b/lib/stdlib/test/re_SUITE.erl
@@ -1006,10 +1006,10 @@ error_info(_Config) ->
     {ok,GoodRegexp} = re:compile(".*"),
 
     L = [{compile, [not_iodata]},
-         {compile, [not_iodata, not_list]},
+         {compile, [not_iodata, not_list],[{1,".*"},{2,".*"}]},
          {compile, [<<".*">>, [a|b]]},
          {compile, [<<".*">>, [bad_option]]},
-         {compile, [{a,b}, [bad_option]]},
+         {compile, [{a,b}, [bad_option]],[{1,".*"},{2,".*"}]},
 
          {grun, 3},                             %Internal.
 
@@ -1020,29 +1020,29 @@ error_info(_Config) ->
 
          {internal_run, 4},                     %Internal.
 
-         {replace, [{a,b}, {x,y}, {z,z}]},
-         {replace, [{a,b}, BadRegexp, {z,z}]},
+         {replace, [{a,b}, {x,y}, {z,z}],[{1,".*"},{2,".*"},{3,".*"}]},
+         {replace, [{a,b}, BadRegexp, {z,z}],[{1,".*"},{2,".*"},{3,".*"}]},
 
-         {replace, [{a,b}, {x,y}, {z,z}, [a|b]]},
-         {replace, [{a,b}, BadRegexp, [bad_option]]},
-         {replace, ["", "", {z,z}, not_a_list]},
+         {replace, [{a,b}, {x,y}, {z,z}, [a|b]],[{1,".*"},{2,".*"},{3,".*"},{4,".*"}]},
+         {replace, [{a,b}, BadRegexp, [bad_option]],[{1,".*"},{2,".*"},{3,".*"}]},
+         {replace, ["", "", {z,z}, not_a_list],[{3,".*"},{4,".*"}]},
 
-         {run, [{a,b}, {x,y}]},
+         {run, [{a,b}, {x,y}],[{1,".*"},{2,".*"}]},
          {run, [{a,b}, ".*"]},
          {run, ["abc", {x,y}]},
          {run, ["abc", BadRegexp]},
 
-         {run, [{a,b}, {x,y}, []]},
+         {run, [{a,b}, {x,y}, []],[{1,".*"},{2,".*"}]},
          {run, ["abc", BadRegexp, []]},
-         {run, [{a,b}, {x,y}, [a|b]]},
-         {run, [{a,b}, ".*", bad_options]},
-         {run, ["abc", {x,y}, [bad_option]]},
-         {run, ["abc", BadRegexp, 9999]},
+         {run, [{a,b}, {x,y}, [a|b]],[{1,".*"},{2,".*"},{3,".*"}]},
+         {run, [{a,b}, ".*", bad_options],[{1,".*"},{3,".*"}]},
+         {run, ["abc", {x,y}, [bad_option]],[{2,".*"},{3,".*"}]},
+         {run, ["abc", BadRegexp, 9999],[{2,".*"},{3,".*"}]},
 
          {split, ["abc", BadRegexp]},
          {split, [{a,b}, ".*"]},
 
-         {split, ["abc", BadRegexp, [a|b]]},
+         {split, ["abc", BadRegexp, [a|b]],[{2,".*"},{3,".*"}]},
          {split, [{a,b}, ".*", [bad_option]]},
 
          {ucompile, 2},                         %Internal.
diff --git a/lib/stdlib/test/unicode_SUITE.erl b/lib/stdlib/test/unicode_SUITE.erl
index 1833a61478..7b4960ab36 100644
--- a/lib/stdlib/test/unicode_SUITE.erl
+++ b/lib/stdlib/test/unicode_SUITE.erl
@@ -1411,9 +1411,9 @@ make_unaligned(Bin0) when is_binary(Bin0) ->
 error_info(_Config) ->
     L = [{characters_to_binary, [abc]},
          {characters_to_binary,[abc, utf8]},
-         {characters_to_binary,[abc, bad_encoding]},
+         {characters_to_binary,[abc, bad_encoding],[{1,".*"},{2,".*"}]},
 
-         {characters_to_binary, [abc, pqr, xyz]},
+         {characters_to_binary, [abc, pqr, xyz],[{1,".*"},{2,".*"},{3,".*"}]},
          {characters_to_binary, [abc, latin1, utf8]},
          {characters_to_binary, [<<1:1>>, utf8, latin1]},
 
-- 
2.26.2

Places

File 1090-stdlib-Add-error_info-test-for-multiple-messages.patch of Package erlang (Revision c60a113e1eaed31d142b913626c9a44a)

Places