Merge branch 'bjorn/hipe-test-cases' into maint

* bjorn/hipe-test-cases:
  debugger tests: Increase time trap timeout
  fprof_SUITE: Skip create_file_slow/1 if libraries are native
  etop_SUITE: Skip a test case if libraries are native-compiled
  Skip all inviso test cases if libraries are native-compiled
  erl_prim_loader_SUITE: Handle native-compiled erl_boot_server
  re_SUITE: Skip error_handling/1 if 're' is native code
  shell_SUITE: Handle different EXIT reasons from native code
  sofs_SUITE: Handle different EXIT reasons from native code
  erl_eval_SUITE: Skip test of parameterized modules if native code
  trace_port_SUITE: Skip test cases if 'lists' is native-compiled
  call_trace_SUITE: Skip test cases if libraries are native-compiled

1 files changed, 31 insertions, 23 deletions

diff --git a/lib/stdlib/test/re_SUITE.erl b/lib/stdlib/test/re_SUITE.erl
index 3b2e637c84..d6d946a28f 100644
--- a/lib/stdlib/test/re_SUITE.erl
+++ b/lib/stdlib/test/re_SUITE.erl
@@ -445,9 +445,17 @@ split_specials(Config) when is_list(Config) ->
     ok.
     
 
-error_handling(doc) ->
-    ["Test that errors are handled correctly by the erlang code."];
-error_handling(Config) when is_list(Config) ->
+%% Test that errors are handled correctly by the erlang code.
+error_handling(_Config) ->
+    case test_server:is_native(re) of
+	true ->
+	    %% Exceptions from native code look too different.
+	    {skip,"re is native"};
+	false ->
+	    error_handling()
+    end.
+	    
+error_handling() ->
     % This test checks the exception tuples manufactured in the erlang
     % code to hide the trapping from the user at least when it comes to errors
     Dog = ?t:timetrap(?t:minutes(1)),
@@ -455,14 +463,14 @@ error_handling(Config) when is_list(Config) ->
     % the trap to re:grun from grun, in the grun function clause
     % that handles precompiled expressions
     ?line {'EXIT',{badarg,[{re,run,["apa",{1,2,3,4},[global]],_},
-			   {?MODULE,error_handling,1,_} | _]}} =
+			   {?MODULE,error_handling,0,_} | _]}} =
 	(catch re:run("apa",{1,2,3,4},[global])),
     % An invalid capture list will also cause a badarg late, 
     % but with a non pre compiled RE, the exception should be thrown by the
     % grun function clause that handles RE's compiled implicitly by
     % the run/3 BIF before trapping.
     ?line {'EXIT',{badarg,[{re,run,["apa","p",[{capture,[1,{a}]},global]],_},
-			   {?MODULE,error_handling,1,_} | _]}} =
+			   {?MODULE,error_handling,0,_} | _]}} =
 	(catch re:run("apa","p",[{capture,[1,{a}]},global])),
     % And so the case of a precompiled expression together with
     % a compile-option (binary and list subject):
@@ -473,88 +481,88 @@ error_handling(Config) when is_list(Config) ->
 			    [<<"apa">>,
 			     {re_pattern,1,0,_},
 			     [global,unicode]],_},
-			   {?MODULE,error_handling,1,_} | _]}} =
+			   {?MODULE,error_handling,0,_} | _]}} =
 	(catch re:run(<<"apa">>,RE,[global,unicode])),
     ?line {'EXIT',{badarg,[{re,run,
 			    ["apa",
 			     {re_pattern,1,0,_},
 			     [global,unicode]],_},
-			   {?MODULE,error_handling,1,_} | _]}} =
+			   {?MODULE,error_handling,0,_} | _]}} =
 	(catch re:run("apa",RE,[global,unicode])),
     ?line {'EXIT',{badarg,_}} = (catch re:run("apa","(p",[])),
     ?line {'EXIT',{badarg,_}} = (catch re:run("apa","(p",[global])),
     % The replace errors:
     ?line {'EXIT',{badarg,[{re,replace,["apa",{1,2,3,4},"X",[]],_},
-			   {?MODULE,error_handling,1,_} | _]}} =
+			   {?MODULE,error_handling,0,_} | _]}} =
 	(catch re:replace("apa",{1,2,3,4},"X",[])),
     ?line {'EXIT',{badarg,[{re,replace,["apa",{1,2,3,4},"X",[global]],_},
-			   {?MODULE,error_handling,1,_} | _]}} =
+			   {?MODULE,error_handling,0,_} | _]}} =
 	(catch re:replace("apa",{1,2,3,4},"X",[global])),
     ?line {'EXIT',{badarg,[{re,replace,
 			    ["apa",
 			     {re_pattern,1,0,_},
 			     "X",
 			     [unicode]],_},
-			   {?MODULE,error_handling,1,_} | _]}} =
+			   {?MODULE,error_handling,0,_} | _]}} =
 	(catch re:replace("apa",RE,"X",[unicode])),
     ?line <<"aXa">> = iolist_to_binary(re:replace("apa","p","X",[])),
     ?line {'EXIT',{badarg,[{re,replace,
 			    ["apa","p","X",[{capture,all,binary}]],_},
-			   {?MODULE,error_handling,1,_} | _]}} =
+			   {?MODULE,error_handling,0,_} | _]}} =
 	(catch iolist_to_binary(re:replace("apa","p","X",
 					  [{capture,all,binary}]))),
     ?line {'EXIT',{badarg,[{re,replace,
 			    ["apa","p","X",[{capture,all}]],_},
-			   {?MODULE,error_handling,1,_} | _]}} =
+			   {?MODULE,error_handling,0,_} | _]}} =
 	(catch iolist_to_binary(re:replace("apa","p","X",
 					  [{capture,all}]))),
     ?line {'EXIT',{badarg,[{re,replace,
 			    ["apa","p","X",[{return,banana}]],_},
-			   {?MODULE,error_handling,1,_} | _]}} =
+			   {?MODULE,error_handling,0,_} | _]}} =
 	(catch iolist_to_binary(re:replace("apa","p","X",
 					  [{return,banana}]))),
     ?line {'EXIT',{badarg,_}} = (catch re:replace("apa","(p","X",[])),
     % Badarg, not compile error.
     ?line {'EXIT',{badarg,[{re,replace,
 			    ["apa","(p","X",[{return,banana}]],_},
-			   {?MODULE,error_handling,1,_} | _]}} =
+			   {?MODULE,error_handling,0,_} | _]}} =
 	(catch iolist_to_binary(re:replace("apa","(p","X",
 					  [{return,banana}]))),
     % And the split errors:
     ?line [<<"a">>,<<"a">>] = (catch re:split("apa","p",[])),
     ?line [<<"a">>,<<"p">>,<<"a">>] = (catch re:split("apa",RE,[])),
     ?line {'EXIT',{badarg,[{re,split,["apa","p",[global]],_},
-			   {?MODULE,error_handling,1,_} | _]}} =
+			   {?MODULE,error_handling,0,_} | _]}} =
 	(catch re:split("apa","p",[global])),
     ?line {'EXIT',{badarg,[{re,split,["apa","p",[{capture,all}]],_},
-			   {?MODULE,error_handling,1,_} | _]}} =
+			   {?MODULE,error_handling,0,_} | _]}} =
 	(catch re:split("apa","p",[{capture,all}])),
     ?line {'EXIT',{badarg,[{re,split,["apa","p",[{capture,all,binary}]],_},
-			   {?MODULE, error_handling,1,_} | _]}} =
+			   {?MODULE, error_handling,0,_} | _]}} =
 	(catch re:split("apa","p",[{capture,all,binary}])),
     ?line {'EXIT',{badarg,[{re,split,["apa",{1,2,3,4},[]],_},
-			   {?MODULE,error_handling,1,_} | _]}} =
+			   {?MODULE,error_handling,0,_} | _]}} =
 	(catch re:split("apa",{1,2,3,4})),
     ?line {'EXIT',{badarg,[{re,split,["apa",{1,2,3,4},[]],_},
-			   {?MODULE,error_handling,1,_} | _]}} =
+			   {?MODULE,error_handling,0,_} | _]}} =
 	(catch re:split("apa",{1,2,3,4},[])),
     ?line {'EXIT',{badarg,[{re,split,
 			    ["apa",
 			     RE,
 			     [unicode]],_},
-			   {?MODULE,error_handling,1,_} | _]}} =
+			   {?MODULE,error_handling,0,_} | _]}} =
 	(catch re:split("apa",RE,[unicode])),
     ?line {'EXIT',{badarg,[{re,split,
 			    ["apa",
 			     RE,
 			     [{return,banana}]],_},
-			   {?MODULE,error_handling,1,_} | _]}} =
+			   {?MODULE,error_handling,0,_} | _]}} =
 	(catch re:split("apa",RE,[{return,banana}])),
     ?line {'EXIT',{badarg,[{re,split,
 			    ["apa",
 			     RE,
 			     [banana]],_},
-			   {?MODULE,error_handling,1,_} | _]}} =
+			   {?MODULE,error_handling,0,_} | _]}} =
 	(catch re:split("apa",RE,[banana])),
     ?line {'EXIT',{badarg,_}} = (catch re:split("apa","(p")),
     %Exception on bad argument, not compilation error
@@ -562,7 +570,7 @@ error_handling(Config) when is_list(Config) ->
 			    ["apa",
 			     "(p",
 			     [banana]],_},
-			   {?MODULE,error_handling,1,_} | _]}} =
+			   {?MODULE,error_handling,0,_} | _]}} =
 	(catch re:split("apa","(p",[banana])),
     ?t:timetrap_cancel(Dog),
     ok.