Merge branch 'hb/stdlib/fix_testsuites/OTP-9637'

* hb/stdlib/fix_testsuites/OTP-9637:
  Fix a few tests that used to fail on the HiPE platform

3 files changed, 123 insertions, 106 deletions

diff --git a/lib/stdlib/test/dets_SUITE.erl b/lib/stdlib/test/dets_SUITE.erl
index 63767aeda6..6f77cff2b9 100644
--- a/lib/stdlib/test/dets_SUITE.erl
+++ b/lib/stdlib/test/dets_SUITE.erl
@@ -1865,10 +1865,10 @@ fixtable(Config, Version) when is_list(Config) ->
     ?line {ok, _} = dets:open_file(T, Args),
 
     %% badarg
-    ?line {'EXIT', {badarg, [{dets,safe_fixtable,[no_table,true],_}|_]}} =
-	(catch dets:safe_fixtable(no_table,true)),
-    ?line {'EXIT', {badarg, [{dets,safe_fixtable,[T,undefined],_}|_]}} =
-	(catch dets:safe_fixtable(T,undefined)),
+    ?line check_badarg(catch dets:safe_fixtable(no_table,true),
+		       dets, safe_fixtable, [no_table,true]),
+    ?line check_badarg(catch dets:safe_fixtable(T,undefined),
+		       dets, safe_fixtable, [T,undefined]),
 
     %% The table is not allowed to grow while the elements are inserted:
 
@@ -1948,22 +1948,22 @@ match(Config, Version) ->
 
     %% match, badarg
     MSpec = [{'_',[],['$_']}],
-    ?line {'EXIT', {badarg, [{dets,safe_fixtable,[no_table,true],_}|_]}} =
-	(catch dets:match(no_table, '_')),
-    ?line {'EXIT', {badarg, [{dets,match,[T,'_',not_a_number],_}|_]}} =
-	(catch dets:match(T, '_', not_a_number)),
+    ?line check_badarg(catch dets:match(no_table, '_'),
+		       dets, safe_fixtable, [no_table,true]),
+    ?line check_badarg(catch dets:match(T, '_', not_a_number),
+		       dets, match, [T,'_',not_a_number]),
     ?line {EC1, _} = dets:select(T, MSpec, 1),
-    ?line {'EXIT', {badarg, [{dets,match,[EC1],_}|_]}} =
-	(catch dets:match(EC1)),
+    ?line check_badarg(catch dets:match(EC1),
+		       dets, match, [EC1]),
 
     %% match_object, badarg
-    ?line {'EXIT', {badarg, [{dets,safe_fixtable,[no_table,true],_}|_]}} =
-	(catch dets:match_object(no_table, '_')),
-    ?line {'EXIT', {badarg, [{dets,match_object,[T,'_',not_a_number],_}|_]}} =
-	(catch dets:match_object(T, '_', not_a_number)),
+    ?line check_badarg(catch dets:match_object(no_table, '_'),
+		       dets, safe_fixtable, [no_table,true]),
+    ?line check_badarg(catch dets:match_object(T, '_', not_a_number),
+		       dets, match_object, [T,'_',not_a_number]),
     ?line {EC2, _} = dets:select(T, MSpec, 1),
-    ?line {'EXIT', {badarg, [{dets,match_object,[EC2],_}|_]}} =
-	(catch dets:match_object(EC2)),
+    ?line check_badarg(catch dets:match_object(EC2),
+		       dets, match_object, [EC2]),
 
     dets:safe_fixtable(T, true),
     ?line {[_, _], C1} = dets:match_object(T, '_', 2),
@@ -2126,17 +2126,17 @@ select(Config, Version) ->
 
     %% badarg
     MSpec = [{'_',[],['$_']}],
-    ?line {'EXIT', {badarg, [{dets,safe_fixtable,[no_table,true],_}|_]}} =
-	(catch dets:select(no_table, MSpec)),
-    ?line {'EXIT', {badarg, [{dets,select,[T,<<17>>],_}|_]}} =
-	(catch dets:select(T, <<17>>)),
-    ?line {'EXIT', {badarg, [{dets,select,[T,[]],_}|_]}} =
-	(catch dets:select(T, [])),
-    ?line {'EXIT', {badarg, [{dets,select,[T,MSpec,not_a_number],_}|_]}} =
-	(catch dets:select(T, MSpec, not_a_number)),
+    ?line check_badarg(catch dets:select(no_table, MSpec),
+		       dets, safe_fixtable, [no_table,true]),
+    ?line check_badarg(catch dets:select(T, <<17>>),
+		       dets, select, [T,<<17>>]),
+    ?line check_badarg(catch dets:select(T, []),
+		       dets, select, [T,[]]),
+    ?line check_badarg(catch dets:select(T, MSpec, not_a_number),
+		       dets, select, [T,MSpec,not_a_number]),
     ?line {EC, _} = dets:match(T, '_', 1),
-    ?line {'EXIT', {badarg, [{dets,select,[EC],_}|_]}} =
-	(catch dets:select(EC)),
+    ?line check_badarg(catch dets:select(EC),
+		       dets, select, [EC]),
 
     AllSpec = [{'_',[],['$_']}],
 
@@ -2218,8 +2218,8 @@ update_counter(Config) when is_list(Config) ->
     ?line file:delete(Fname),
     P0 = pps(),
 
-    ?line {'EXIT', {badarg, [{dets,update_counter,[no_table,1,1],_}|_]}} =
-	(catch dets:update_counter(no_table, 1, 1)),
+    ?line check_badarg(catch dets:update_counter(no_table, 1, 1),
+		       dets, update_counter, [no_table,1,1]),
 
     Args = [{file,Fname},{keypos,2}],
     ?line {ok, _} = dets:open_file(T, [{type,set} | Args]),
@@ -2262,67 +2262,66 @@ badarg(Config) when is_list(Config) ->
     %% badargs are tested in match, select and fixtable too.
 
     %% open
-    ?line {'EXIT', {badarg, [{dets,open_file,[{a,tuple},[]],_}|_]}} =
-	(catch dets:open_file({a,tuple},[])),
-    ?line {'EXIT', {badarg, [{dets,open_file,[{a,tuple}],_}|_]}} =
-	(catch dets:open_file({a,tuple})),
-    ?line {'EXIT', {badarg, [{dets,open_file,[file,[foo]],_}|_]}} =
-	(catch dets:open_file(file,[foo])),
-    ?line {'EXIT', {badarg,[{dets,open_file,
-			     [{hej,san},[{type,set}|3]],_}|_]}} =
-	(catch dets:open_file({hej,san},[{type,set}|3])),
+    ?line check_badarg(catch dets:open_file({a,tuple},[]),
+		       dets, open_file, [{a,tuple},[]]),
+    ?line check_badarg(catch dets:open_file({a,tuple}),
+		       dets, open_file,[{a,tuple}]),
+    ?line check_badarg(catch dets:open_file(file,[foo]),
+		       dets, open_file, [file,[foo]]),
+    ?line check_badarg(catch dets:open_file({hej,san},[{type,set}|3]),
+		       dets, open_file, [{hej,san},[{type,set}|3]]),
 
     %% insert
-    ?line {'EXIT', {badarg, [{dets,insert,[no_table,{1,2}],_}|_]}} =
-	(catch dets:insert(no_table, {1,2})),
-    ?line {'EXIT', {badarg, [{dets,insert,[no_table,[{1,2}]],_}|_]}} =
-	(catch dets:insert(no_table, [{1,2}])),
-    ?line {'EXIT', {badarg, [{dets,insert,[T,{1,2}],_}|_]}} =
-	(catch dets:insert(T, {1,2})),
-    ?line {'EXIT', {badarg, [{dets,insert,[T,[{1,2}]],_}|_]}} =
-	(catch dets:insert(T, [{1,2}])),
-    ?line {'EXIT', {badarg, [{dets,insert,[T,[{1,2,3}|3]],_}|_]}} =
-	      (catch dets:insert(T, [{1,2,3} | 3])),
+    ?line check_badarg(catch dets:insert(no_table, {1,2}),
+		       dets, insert, [no_table,{1,2}]),
+    ?line check_badarg(catch dets:insert(no_table, [{1,2}]),
+		       dets, insert, [no_table,[{1,2}]]),
+    ?line check_badarg(catch dets:insert(T, {1,2}),
+		       dets, insert, [T,{1,2}]),
+    ?line check_badarg(catch dets:insert(T, [{1,2}]),
+		       dets, insert, [T,[{1,2}]]),
+    ?line check_badarg(catch dets:insert(T, [{1,2,3} | 3]),
+		       dets, insert, [T,[{1,2,3}|3]]),
 
     %% lookup{_keys}
-    ?line {'EXIT', {badarg, [{dets,lookup_keys,[badarg,[]],_}|_]}} =
-	(catch dets:lookup_keys(T, [])),
-    ?line {'EXIT', {badarg, [{dets,lookup,[no_table,1],_}|_]}} =
-	(catch dets:lookup(no_table, 1)),
-    ?line {'EXIT', {badarg, [{dets,lookup_keys,[T,[1|2]],_}|_]}} =
-	(catch dets:lookup_keys(T, [1 | 2])),
+    ?line check_badarg(catch dets:lookup_keys(T, []),
+		       dets, lookup_keys, [badarg,[]]),
+    ?line check_badarg(catch dets:lookup(no_table, 1),
+		       dets, lookup, [no_table,1]),
+    ?line check_badarg(catch dets:lookup_keys(T, [1 | 2]),
+		       dets, lookup_keys, [T,[1|2]]),
 
     %% member
-    ?line {'EXIT', {badarg, [{dets,member,[no_table,1],_}|_]}} =
-	(catch dets:member(no_table, 1)),
+    ?line check_badarg(catch dets:member(no_table, 1),
+		       dets, member, [no_table,1]),
 
     %% sync
-    ?line {'EXIT', {badarg, [{dets,sync,[no_table],_}|_]}} =
-	(catch dets:sync(no_table)),
+    ?line check_badarg(catch dets:sync(no_table),
+		       dets, sync, [no_table]),
 
     %% delete{_keys}
-    ?line {'EXIT', {badarg, [{dets,delete,[no_table,1],_}|_]}} =
-	(catch dets:delete(no_table, 1)),
+    ?line check_badarg(catch dets:delete(no_table, 1),
+		       dets, delete, [no_table,1]),
 
     %% delete_object
-    ?line {'EXIT', {badarg, [{dets,delete_object,[no_table,{1,2,3}],_}|_]}} =
-	(catch dets:delete_object(no_table, {1,2,3})),
-    ?line {'EXIT', {badarg, [{dets,delete_object,[T,{1,2}],_}|_]}} =
-	(catch dets:delete_object(T, {1,2})),
-    ?line {'EXIT', {badarg, [{dets,delete_object,[no_table,[{1,2,3}]],_}|_]}} =
-	(catch dets:delete_object(no_table, [{1,2,3}])),
-    ?line {'EXIT', {badarg, [{dets,delete_object,[T,[{1,2}]],_}|_]}} =
-	(catch dets:delete_object(T, [{1,2}])),
-    ?line {'EXIT', {badarg, [{dets,delete_object,[T,[{1,2,3}|3]],_}|_]}} =
-	(catch dets:delete_object(T, [{1,2,3} | 3])),
+    ?line check_badarg(catch dets:delete_object(no_table, {1,2,3}),
+		       dets, delete_object, [no_table,{1,2,3}]),
+    ?line check_badarg(catch dets:delete_object(T, {1,2}),
+		       dets, delete_object, [T,{1,2}]),
+    ?line check_badarg(catch dets:delete_object(no_table, [{1,2,3}]),
+		       dets, delete_object, [no_table,[{1,2,3}]]),
+    ?line check_badarg(catch dets:delete_object(T, [{1,2}]),
+		       dets, delete_object, [T,[{1,2}]]),
+    ?line check_badarg(catch dets:delete_object(T, [{1,2,3} | 3]),
+		       dets, delete_object, [T,[{1,2,3}|3]]),
 
     %% first,next,slot
-    ?line {'EXIT', {badarg, [{dets,first,[no_table],_}|_]}} =
-	(catch dets:first(no_table)),
-    ?line {'EXIT', {badarg, [{dets,next,[no_table,1],_}|_]}} =
-	(catch dets:next(no_table, 1)),
-    ?line {'EXIT', {badarg, [{dets,slot,[no_table,0],_}|_]}} =
-	(catch dets:slot(no_table, 0)),
+    ?line check_badarg(catch dets:first(no_table),
+		       dets, first, [no_table]),
+    ?line check_badarg(catch dets:next(no_table, 1),
+		       dets, next, [no_table,1]),
+    ?line check_badarg(catch dets:slot(no_table, 0),
+		       dets, slot, [no_table,0]),
 
     %% info
     ?line undefined = dets:info(no_table),
@@ -2330,27 +2329,27 @@ badarg(Config) when is_list(Config) ->
     ?line undefined = dets:info(T, foo),
 
     %% match_delete
-    ?line {'EXIT', {badarg, [{dets,safe_fixtable,[no_table,true],_}|_]}} =
-	(catch dets:match_delete(no_table, '_')),
+    ?line check_badarg(catch dets:match_delete(no_table, '_'),
+		       dets, safe_fixtable, [no_table,true]),
 
     %% delete_all_objects
-    ?line {'EXIT', {badarg, [{dets,delete_all_objects,[no_table],_}|_]}} =
-	(catch dets:delete_all_objects(no_table)),
+    ?line check_badarg(catch dets:delete_all_objects(no_table),
+		       dets, delete_all_objects, [no_table]),
 
     %% select_delete
     MSpec = [{'_',[],['$_']}],
-    ?line {'EXIT', {badarg, [{dets,safe_fixtable,[no_table,true],_}|_]}} =
-	(catch dets:select_delete(no_table, MSpec)),
-    ?line {'EXIT', {badarg, [{dets,select_delete,[T, <<17>>],_}|_]}} =
-	(catch dets:select_delete(T, <<17>>)),
+    ?line check_badarg(catch dets:select_delete(no_table, MSpec),
+		       dets, safe_fixtable, [no_table,true]),
+    ?line check_badarg(catch dets:select_delete(T, <<17>>),
+		       dets, select_delete, [T, <<17>>]),
 
     %% traverse, fold
-    ?line {'EXIT', {badarg, [{dets,safe_fixtable,[no_table,true],_}|_]}} =
-	(catch dets:traverse(no_table, fun(_) -> continue end)),
-    ?line {'EXIT', {badarg, [{dets,safe_fixtable,[no_table,true],_}|_]}} =
-	(catch dets:foldl(fun(_, A) -> A end, [], no_table)),
-    ?line {'EXIT', {badarg, [{dets,safe_fixtable,[no_table,true],_}|_]}} =
-	(catch dets:foldr(fun(_, A) -> A end, [], no_table)),
+    ?line check_badarg(catch dets:traverse(no_table, fun(_) -> continue end),
+		       dets, safe_fixtable, [no_table,true]),
+    ?line check_badarg(catch dets:foldl(fun(_, A) -> A end, [], no_table),
+		       dets, safe_fixtable, [no_table,true]),
+    ?line check_badarg(catch dets:foldr(fun(_, A) -> A end, [], no_table),
+		       dets, safe_fixtable, [no_table,true]),
 
     %% close
     ?line ok = dets:close(T),
@@ -2358,15 +2357,16 @@ badarg(Config) when is_list(Config) ->
     ?line {error, not_owner} = dets:close(T),
 
     %% init_table
-    ?line {'EXIT', {badarg,[{dets,init_table,[no_table,_,[]],_}|_]}} =
-	(catch dets:init_table(no_table, fun(X) -> X end)),
-    ?line {'EXIT', {badarg,[{dets,init_table,[no_table,_,[]],_}|_]}} =
-	(catch dets:init_table(no_table, fun(X) -> X end, [])),
+    IF = fun(X) -> X end,
+    ?line check_badarg(catch dets:init_table(no_table, IF),
+		       dets, init_table, [no_table,IF,[]]),
+    ?line check_badarg(catch dets:init_table(no_table, IF, []),
+		       dets, init_table, [no_table,IF,[]]),
 
     %% from_ets
     Ets = ets:new(ets,[]),
-    ?line {'EXIT', {badarg,[{dets,from_ets,[no_table,_],_}|_]}} =
-	(catch dets:from_ets(no_table, Ets)),
+    ?line check_badarg(catch dets:from_ets(no_table, Ets),
+		       dets, from_ets, [no_table,Ets]),
     ets:delete(Ets),
 
     ?line {ok, T} = dets:open_file(T, Args),
@@ -4358,6 +4358,11 @@ bad_object({error,{{bad_object,_}, FileName}}, FileName) ->
 bad_object({error,{{{bad_object,_,_},_,_,_}, FileName}}, FileName) ->
     ok. % Debug.
 
+check_badarg({'EXIT', {badarg, [{M,F,Args,_} | _]}}, M, F, Args) ->
+    true;
+check_badarg({'EXIT', {badarg, [{M,F,A,_} | _]}}, M, F, Args)  ->
+    true = test_server:is_native(M) andalso length(Args) =:= A.
+
 check_pps(P0) ->
     case pps() of
         P0 ->
diff --git a/lib/stdlib/test/epp_SUITE.erl b/lib/stdlib/test/epp_SUITE.erl
index e58022f4da..f79414db49 100644
--- a/lib/stdlib/test/epp_SUITE.erl
+++ b/lib/stdlib/test/epp_SUITE.erl
@@ -250,16 +250,23 @@ otp_4871(Config) when is_list(Config) ->
     %% so there are some sanity checks before killing.
     ?line {ok,Epp} = epp:open(File, []),
     timer:sleep(1),
-    ?line {current_function,{epp,_,_}} = process_info(Epp, current_function),
+    ?line true = current_module(Epp, epp),
     ?line {monitored_by,[Io]} = process_info(Epp, monitored_by),
-    ?line {current_function,{file_io_server,_,_}} =
-	process_info(Io, current_function),
+    ?line true = current_module(Io, file_io_server),
     ?line exit(Io, emulate_crash),
     timer:sleep(1),
     ?line {error,{_Line,epp,cannot_parse}} = otp_4871_parse_file(Epp),
     ?line epp:close(Epp),
     ok.
 
+current_module(Pid, Mod) ->
+    case process_info(Pid, current_function) of
+        {current_function, undefined} ->
+            true = test_server:is_native(Mod);
+        {current_function, {Mod, _, _}} ->
+            true
+    end.
+
 otp_4871_parse_file(Epp) ->
     case epp:parse_erl_form(Epp) of
 	{ok,_} -> otp_4871_parse_file(Epp);
diff --git a/lib/stdlib/test/ets_SUITE.erl b/lib/stdlib/test/ets_SUITE.erl
index e048764a55..2f4958760b 100644
--- a/lib/stdlib/test/ets_SUITE.erl
+++ b/lib/stdlib/test/ets_SUITE.erl
@@ -795,21 +795,26 @@ t_ets_dets(Config, Opts) ->
     ?line true = ets:from_dets(ETab,DTab),
     ?line 3000 = ets:info(ETab,size),
     ?line ets:delete(ETab),
-    ?line {'EXIT',{badarg,[{ets,to_dets,[ETab,DTab],_}|_]}} =
-	(catch ets:to_dets(ETab,DTab)),
-    ?line {'EXIT',{badarg,[{ets,from_dets,[ETab,DTab],_}|_]}} =
-	(catch ets:from_dets(ETab,DTab)),
+    ?line check_badarg(catch ets:to_dets(ETab,DTab),
+		       ets, to_dets, [ETab,DTab]),
+    ?line check_badarg(catch ets:from_dets(ETab,DTab),
+		       ets, from_dets, [ETab,DTab]),
     ?line ETab2 = ets_new(x,Opts),
     ?line filltabint(ETab2,3000),
     ?line dets:close(DTab),
-    ?line {'EXIT',{badarg,[{ets,to_dets,[ETab2,DTab],_}|_]}} =
-	(catch ets:to_dets(ETab2,DTab)),
-    ?line {'EXIT',{badarg,[{ets,from_dets,[ETab2,DTab],_}|_]}} =
-	(catch ets:from_dets(ETab2,DTab)),
+    ?line check_badarg(catch ets:to_dets(ETab2,DTab),
+		       ets, to_dets, [ETab2,DTab]),
+    ?line check_badarg(catch ets:from_dets(ETab2,DTab),
+		       ets, from_dets, [ETab2,DTab]),
     ?line ets:delete(ETab2),
     ?line (catch file:delete(Fname)),
     ok.
 
+check_badarg({'EXIT', {badarg, [{M,F,Args,_} | _]}}, M, F, Args) ->
+    true;
+check_badarg({'EXIT', {badarg, [{M,F,A,_} | _]}}, M, F, Args)  ->
+    true = test_server:is_native(M) andalso length(Args) =:= A.
+
 t_delete_all_objects(doc) ->
     ["Test ets:delete_all_objects/1"];
 t_delete_all_objects(suite) ->