File 1085-stdlib-Expand-error_info-test-lib-to-test-... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 1085-stdlib-Expand-error_info-test-lib-to-test-text.patch of Package erlang (Revision a0b3ae25eeaaf8007a46a3a2b2ca2729)

Currently displaying revision a0b3ae25eeaaf8007a46a3a2b2ca2729 , Show latest

From e3787820453bf92280fd18361ede507fdb61f681 Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas@erlang.org>
Date: Fri, 23 Apr 2021 15:08:19 +0200
Subject: [PATCH 05/13] stdlib: Expand error_info test lib to test text

---
 lib/stdlib/test/error_info_lib.erl | 44 ++++++++++++++++++++----------
 1 file changed, 30 insertions(+), 14 deletions(-)

diff --git a/lib/stdlib/test/error_info_lib.erl b/lib/stdlib/test/error_info_lib.erl
index aa4ef98dbc..83470a291b 100644
--- a/lib/stdlib/test/error_info_lib.erl
+++ b/lib/stdlib/test/error_info_lib.erl
@@ -84,23 +84,39 @@ eval_bif_error(F, Args, Opts, T, Module, Errors0) ->
             ArgStr = lists:join(", ", [io_lib:format("~p", [A]) || A <- Args]),
             io:format("\n~p:~p(~s)\n~ts", [Module,F,ArgStr,BinStr]),
 
+            ArgumentTests =
+                case lists:filtermap(
+                       fun({general,Match}) ->
+                               {true,"[*][*][*].*" ++ Match};
+                          ({ArgSlot, Match}) when is_integer(ArgSlot) ->
+                               {true,io_lib:format("[*][*][*] argument ~B:.*~ts",[ArgSlot,Match])};
+                          (_) ->
+                               false
+                       end, Opts) of
+                    [] ->
+                        ["[*][*][*] argument \\d+:"];
+                    Tests ->
+                        Tests
+                end,
 
             case Stk of
                 [{Module,ActualF,ActualArgs,Info}|_] ->
-                    RE = <<"[*][*][*] argument \\d+:">>,
-                    Errors1 = case re:run(BinStr, RE, [{capture, none}]) of
-                                  match ->
-                                      Errors0;
-                                  nomatch when Reason =:= system_limit ->
-                                      Errors0;
-                                  nomatch ->
-                                      case lists:member(unexplained, Opts) of
-                                          true ->
-                                              Errors0;
-                                          false ->
-                                              [{no_explanation,{F,Args},Info}|Errors0]
-                                      end
-                              end,
+                    Errors1 =
+                        case lists:member(unexplained, Opts) of
+                            true ->
+                                Errors0;
+                            false ->
+                                lists:foldl(
+                                  fun(Match, Errors) ->
+                                          case re:run(BinStr, Match, [{capture, none}]) of
+                                              match ->
+                                                  Errors;
+                                              nomatch ->
+                                                  [{no_explanation,{F,Args},
+                                                    Info,BinStr,lists:flatten(Match)}|Errors]
+                                          end
+                                  end, Errors0, ArgumentTests)
+                        end,
                     Errors = case {ActualF,ActualArgs} of
                                  {F,Args} ->
                                      Errors1;
-- 
2.26.2

Places

File 1085-stdlib-Expand-error_info-test-lib-to-test-text.patch of Package erlang (Revision a0b3ae25eeaaf8007a46a3a2b2ca2729)

Places