File 1108-Allow-stacktrace-variation-in-exception-te... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 1108-Allow-stacktrace-variation-in-exception-test-cases.patch of Package erlang (Revision 10057cdd08b49523c478d769b4688ac6)

Currently displaying revision 10057cdd08b49523c478d769b4688ac6 , Show latest

From a543df40d92830287ce04dcddebb489d2df95c61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= <bjorn@erlang.org>
Date: Tue, 20 Apr 2021 05:59:50 +0200
Subject: [PATCH 08/20] Allow stacktrace variation in exception test cases

The JIT for ARM will give a more detailed stacktrace for operators
such as '+'/2 (the top stacktrace entry will be for the operator
including its arguments). Update test cases that test for exceptions
to allow for this variation.
---
 erts/emulator/test/exception_SUITE.erl  | 53 +++++++++++++++++++------
 lib/compiler/test/beam_except_SUITE.erl | 12 +++++-
 lib/stdlib/test/beam_lib_SUITE.erl      | 20 +++++++---
 3 files changed, 64 insertions(+), 21 deletions(-)

diff --git a/erts/emulator/test/exception_SUITE.erl b/erts/emulator/test/exception_SUITE.erl
index 8345eb4a1b..9d89569fdc 100644
--- a/erts/emulator/test/exception_SUITE.erl
+++ b/erts/emulator/test/exception_SUITE.erl
@@ -1406,11 +1406,23 @@ line_numbers(Config) when is_list(Config) ->
                [{file,"fake_file.erl"},{line,3}]},
               {?MODULE,line_numbers,1,_}|_]}} =
     (catch line1(bad_tag, 0)),
-    {'EXIT',{badarith,
-             [{?MODULE,line1,2,
-               [{file,"fake_file.erl"},{line,5}]},
-              {?MODULE,line_numbers,1,_}|_]}} =
-    (catch line1(a, not_an_integer)),
+
+    %% The stacktrace for operators such a '+' can vary depending on
+    %% whether the JIT is used or not.
+    case catch line1(a, not_an_integer) of
+        {'EXIT',{badarith,
+                 [{erlang,'+',[not_an_integer,1],_},
+                  {?MODULE,line1,2,
+                   [{file,"fake_file.erl"},{line,5}]},
+                  {?MODULE,line_numbers,1,_}|_]}} ->
+            ok;
+        {'EXIT',{badarith,
+                 [{?MODULE,line1,2,
+                   [{file,"fake_file.erl"},{line,5}]},
+                  {?MODULE,line_numbers,1,_}|_]}} ->
+            ok
+    end,
+
     {'EXIT',{{badmatch,{ok,1}},
              [{?MODULE,line1,2,
                [{file,"fake_file.erl"},{line,7}]},
@@ -1494,14 +1506,29 @@ line_numbers(Config) when is_list(Config) ->
               {?MODULE,line_numbers,1,_}|_]}} =
     (catch applied_bif_2()),
 
-    {'EXIT',{badarith,
-             [{?MODULE,increment1,1,[{file,"increment.erl"},{line,45}]},
-              {?MODULE,line_numbers,1,_}|_]}} =
-        (catch increment1(x)),
-    {'EXIT',{badarith,
-             [{?MODULE,increment2,1,[{file,"increment.erl"},{line,48}]},
-              {?MODULE,line_numbers,1,_}|_]}} =
-        (catch increment2(x)),
+    case catch increment1(x) of
+        {'EXIT',{badarith,
+                 [{erlang,'+',[x,1],_},
+                  {?MODULE,increment1,1,[{file,"increment.erl"},{line,45}]},
+                  {?MODULE,line_numbers,1,_}|_]}} ->
+            ok;
+        {'EXIT',{badarith,
+                 [{?MODULE,increment1,1,[{file,"increment.erl"},{line,45}]},
+                  {?MODULE,line_numbers,1,_}|_]}} ->
+            ok
+    end,
+
+    case catch increment2(x) of
+        {'EXIT',{badarith,
+                 [{erlang,'+',[x,1],_},
+                  {?MODULE,increment2,1,[{file,"increment.erl"},{line,48}]},
+                  {?MODULE,line_numbers,1,_}|_]}} ->
+            ok;
+        {'EXIT',{badarith,
+                 [{?MODULE,increment2,1,[{file,"increment.erl"},{line,48}]},
+                  {?MODULE,line_numbers,1,_}|_]}} ->
+            ok
+    end,
 
     {'EXIT',{{badmap,not_a_map},
              [{?MODULE,update_map,1,[{file,"map.erl"},{line,3}]}|_]}} =
diff --git a/lib/compiler/test/beam_except_SUITE.erl b/lib/compiler/test/beam_except_SUITE.erl
index ec29659f66..8530d4591f 100644
--- a/lib/compiler/test/beam_except_SUITE.erl
+++ b/lib/compiler/test/beam_except_SUITE.erl
@@ -114,8 +114,16 @@ coverage(_) ->
     {'EXIT',{undef,[{erlang,error,[a,b,c,d],_}|_]}} =
 	(catch erlang:error(a, b, c, d)),
 
-    {'EXIT',{badarith,[{?MODULE,bar,1,[File,{line,9}]}|_]}} =
-	(catch bar(x)),
+    %% The stacktrace for operators such a '+' can vary depending on
+    %% whether the JIT is used or not.
+    case catch bar(x) of
+        {'EXIT',{badarith,[{erlang,'+',[x,1],[_|_]},
+                           {?MODULE,bar,1,[File,{line,9}]}|_]}} ->
+            ok;
+        {'EXIT',{badarith,[{?MODULE,bar,1,[File,{line,9}]}|_]}} ->
+            ok
+    end,
+
     {'EXIT',{{case_clause,{1}},[{?MODULE,bar,1,[File,{line,9}]}|_]}} =
 	(catch bar(0)),
 
diff --git a/lib/stdlib/test/beam_lib_SUITE.erl b/lib/stdlib/test/beam_lib_SUITE.erl
index cbcc596544..abd19f4dab 100644
--- a/lib/stdlib/test/beam_lib_SUITE.erl
+++ b/lib/stdlib/test/beam_lib_SUITE.erl
@@ -393,14 +393,12 @@ strip(Conf) when is_list(Conf) ->
 
     %% check that line number information is still present after stripping
     {module, lines} = code:load_abs(filename:rootname(BeamFile5D1)),
-    {'EXIT',{badarith,[{lines,t,1,Info}|_]}} =
-	(catch lines:t(atom)),
+    Info = get_line_number_info(),
     true = code:delete(lines),
     false = code:purge(lines),
     {ok, {lines,BeamFile5D1}} = beam_lib:strip(BeamFile5D1),
     {module, lines} = code:load_abs(filename:rootname(BeamFile5D1)),
-    {'EXIT',{badarith,[{lines,t,1,Info}|_]}} =
-	(catch lines:t(atom)),
+    Info = get_line_number_info(),
 
     true = (P0 == pps()),
     NoOfTables = erlang:system_info(ets_count),
@@ -459,12 +457,12 @@ strip_add_chunks(Conf) when is_list(Conf) ->
 
     %% check that line number information is still present after stripping
     {module, lines} = code:load_abs(filename:rootname(BeamFile5D1)),
-    {'EXIT',{badarith,[{lines,t,1,Info}|_]}} = (catch lines:t(atom)),
+    Info = get_line_number_info(),
     false = code:purge(lines),
     true = code:delete(lines),
     {ok, {lines,BeamFile5D1}} = beam_lib:strip(BeamFile5D1),
     {module, lines} = code:load_abs(filename:rootname(BeamFile5D1)),
-    {'EXIT',{badarith,[{lines,t,1,Info}|_]}} = (catch lines:t(atom)),
+    Info = get_line_number_info(),
 
     true = (P0 == pps()),
     NoOfTables = erlang:system_info(ets_count),
@@ -965,3 +963,13 @@ run_if_crypto_works(Test) ->
 	    {skip,"The crypto application is missing or broken"}
     end.
 
+get_line_number_info() ->
+    %% The stacktrace for operators such a '+' can vary depending on
+    %% whether the JIT is used or not.
+    case catch lines:t(atom) of
+        {'EXIT',{badarith,[{erlang,'+',[atom,1],_},
+                           {lines,t,1,Info}|_]}} ->
+            Info;
+        {'EXIT',{badarith,[{lines,t,1,Info}|_]}} ->
+            Info
+    end.
-- 
2.26.2

Places

File 1108-Allow-stacktrace-variation-in-exception-test-cases.patch of Package erlang (Revision 10057cdd08b49523c478d769b4688ac6)

Places