Merge branch 'maint'

* maint:
  erlang.xml: Fix a few typos and grammatical errors
  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

11 files changed, 130 insertions, 70 deletions

diff --git a/lib/debugger/test/bs_construct_SUITE.erl b/lib/debugger/test/bs_construct_SUITE.erl
index 187c9f53b0..fa7b40ff1e 100644
--- a/lib/debugger/test/bs_construct_SUITE.erl
+++ b/lib/debugger/test/bs_construct_SUITE.erl
@@ -56,7 +56,7 @@ end_per_group(_GroupName, Config) ->
 
 init_per_testcase(_Case, Config) ->
     test_lib:interpret(?MODULE),
-    Dog = test_server:timetrap(?t:minutes(1)),
+    Dog = test_server:timetrap(?t:minutes(15)),
     [{watchdog,Dog}|Config].
 
 end_per_testcase(_Case, Config) ->
diff --git a/lib/debugger/test/bs_match_misc_SUITE.erl b/lib/debugger/test/bs_match_misc_SUITE.erl
index 89fce263f5..ec3746d76a 100644
--- a/lib/debugger/test/bs_match_misc_SUITE.erl
+++ b/lib/debugger/test/bs_match_misc_SUITE.erl
@@ -57,7 +57,7 @@ end_per_suite(Config) when is_list(Config) ->
 
 init_per_testcase(_Case, Config) ->
     test_lib:interpret(?MODULE),
-    Dog = test_server:timetrap(?t:minutes(1)),
+    Dog = test_server:timetrap(?t:minutes(15)),
     [{watchdog,Dog}|Config].
 
 end_per_testcase(_Case, Config) ->
diff --git a/lib/inviso/test/inviso_tool_SUITE.erl b/lib/inviso/test/inviso_tool_SUITE.erl
index 6b16e506eb..f8a9cea47f 100644
--- a/lib/inviso/test/inviso_tool_SUITE.erl
+++ b/lib/inviso/test/inviso_tool_SUITE.erl
@@ -52,7 +52,12 @@ end_per_group(_GroupName, Config) ->
 %% -----------------------------------------------------------------------------

 

 init_per_suite(Config) ->

-    Config.

+    case test_server:is_native(lists) of
+	true ->
+	    {skip,"Native libs -- tracing doesn't work"};
+	false ->
+	    Config
+    end.
 %% -----------------------------------------------------------------------------

 

 end_per_suite(_Config) ->

diff --git a/lib/kernel/test/erl_prim_loader_SUITE.erl b/lib/kernel/test/erl_prim_loader_SUITE.erl
index 7599a89779..d0d52c5ea7 100644
--- a/lib/kernel/test/erl_prim_loader_SUITE.erl
+++ b/lib/kernel/test/erl_prim_loader_SUITE.erl
@@ -175,10 +175,10 @@ wait_really_started(Node, N) ->
 inet_disconnects(doc) -> ["Start a node using the 'inet' loading method, ",
 			  "then lose the connection."];
 inet_disconnects(Config) when is_list(Config) ->
-    case os:type() of
-	vxworks ->
-	    {comment, "VxWorks: tested separately"};
-	_ ->
+    case test_server:is_native(erl_boot_server) of
+	true ->
+	    {skip,"erl_boot_server is native"};
+	false ->
 	    ?line Name = erl_prim_test_inet_disconnects,
 	    ?line Host = host(),
 	    ?line Cookie = atom_to_list(erlang:get_cookie()),
diff --git a/lib/observer/test/etop_SUITE.erl b/lib/observer/test/etop_SUITE.erl
index a0782ea809..a277453620 100644
--- a/lib/observer/test/etop_SUITE.erl
+++ b/lib/observer/test/etop_SUITE.erl
@@ -57,11 +57,14 @@ end_per_group(_GroupName, Config) ->
     Config.
 
 
-text(suite) ->
-    [];
-text(doc) ->
-    ["Start etop with text presentation"];
-text(Config) when is_list(Config) ->
+%% Start etop with text presentation
+text(_) ->
+    case test_server:is_native(lists) of
+	true -> {skip,"Native libs -- tracing does not work"};
+	false -> text()
+    end.
+
+text() ->
     ?line {ok,Node} = ?t:start_node(node2,peer,[]),
 
     %% Must spawn this process, else the test case will never end.
diff --git a/lib/runtime_tools/test/inviso_SUITE.erl b/lib/runtime_tools/test/inviso_SUITE.erl
index 758867cf45..33626ffd9e 100644
--- a/lib/runtime_tools/test/inviso_SUITE.erl
+++ b/lib/runtime_tools/test/inviso_SUITE.erl
@@ -66,13 +66,18 @@ end_per_group(_GroupName, Config) ->
 
 
 init_per_suite(Config) ->
-    %% No never know who skrewed up this node before this suite! :-)
-    erlang:trace_pattern({'_','_','_'},[],[local]),
-    erlang:trace_pattern({'_','_','_'},[],[global]),
-    erlang:trace(all,false,[all]),
+    case test_server:is_native(lists) of
+	true ->
+	    {skip,"Native libs -- tracing doesn't work"};
+	false ->
+	    %% We never know who messed up this node before this suite! :-)
+	    erlang:trace_pattern({'_','_','_'},[],[local]),
+	    erlang:trace_pattern({'_','_','_'},[],[global]),
+	    erlang:trace(all,false,[all]),
 
-    ?l ok=application:start(runtime_tools),
-    Config.
+	    ok=application:start(runtime_tools),
+	    Config
+    end.
 
 end_per_suite(_Config) ->
     ?l ok=application:stop(runtime_tools).
diff --git a/lib/stdlib/test/erl_eval_SUITE.erl b/lib/stdlib/test/erl_eval_SUITE.erl
index 369d8b224e..ca2f18a05a 100644
--- a/lib/stdlib/test/erl_eval_SUITE.erl
+++ b/lib/stdlib/test/erl_eval_SUITE.erl
@@ -1167,15 +1167,22 @@ do_funs(LFH, EFH) ->
                 [[[0]]], ['F'], LFH, EFH),
 
     %% Tests for a bug found by the Dialyzer - used to crash.
-    ?line check(fun() -> Pmod = erl_eval_helper:new(42), Pmod:add(5) end,
-		"begin Pmod = erl_eval_helper:new(42), Pmod:add(5) end.",
-		47,
-		['Pmod'], LFH, EFH),
-    ?line check(fun() -> Pmod = erl_eval_helper:new(42), B = Pmod:add(7), B end,
-		"begin Pmod = erl_eval_helper:new(42), B = Pmod:add(7), B end.",
-		49,
-		['B','Pmod'], LFH, EFH),
-
+    case test_server:is_native(erl_eval) of
+	true ->
+	    %% Parameterized modules are not supported by HiPE.
+	    ok;
+	false ->
+	    check(fun() -> Pmod = erl_eval_helper:new(42), Pmod:add(5) end,
+		  "begin Pmod = erl_eval_helper:new(42), Pmod:add(5) end.",
+		  47,
+		  ['Pmod'], LFH, EFH),
+	    check(fun() -> Pmod = erl_eval_helper:new(42),
+			   B = Pmod:add(7), B end,
+		  "begin Pmod = erl_eval_helper:new(42), "
+		  "B = Pmod:add(7), B end.",
+		  49,
+		  ['B','Pmod'], LFH, EFH)
+    end,
     ok.
 
 count_down(F, N) when N > 0 ->
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.
diff --git a/lib/stdlib/test/shell_SUITE.erl b/lib/stdlib/test/shell_SUITE.erl
index b6019b86f0..a881742f13 100644
--- a/lib/stdlib/test/shell_SUITE.erl
+++ b/lib/stdlib/test/shell_SUITE.erl
@@ -2388,13 +2388,28 @@ otp_6554(Config) when is_list(Config) ->
         comm_err(<<"V = lists:seq(1, 20), case V of a -> ok end.">>),
     ?line "exception error: no function clause matching" = 
         comm_err(<<"fun(P) when is_pid(P) -> true end(a).">>),
-    ?line "exception error: {function_clause," =
-        comm_err(<<"erlang:error(function_clause, [unproper | list]).">>),
+    case test_server:is_native(erl_eval) of
+	true ->
+	    %% Native code has different exit reason. Don't bother
+	    %% testing them.
+	    ok;
+	false ->
+	    "exception error: {function_clause," =
+		comm_err(<<"erlang:error(function_clause, "
+			  "[unproper | list]).">>),
+	    %% Cheating:
+	    "exception error: no function clause matching "
+		"erl_eval:do_apply(4)" ++ _ =
+		comm_err(<<"erlang:error(function_clause, [4]).">>),
+		"exception error: no function clause matching "
+		"lists:reverse(" ++ _ =
+		comm_err(<<"F=fun() -> hello end, lists:reverse(F).">>),
+		"exception error: no function clause matching "
+		"lists:reverse(34) (lists.erl, line " ++ _ =
+		comm_err(<<"lists:reverse(34).">>)
+    end,
     ?line "exception error: function_clause" =
         comm_err(<<"erlang:error(function_clause, 4).">>),
-    %% Cheating:
-    ?line "exception error: no function clause matching erl_eval:do_apply(4)" ++ _ = 
-        comm_err(<<"erlang:error(function_clause, [4]).">>),
     ?line "exception error: no function clause matching" ++ _ = 
         comm_err(<<"fun(a, b, c, d) -> foo end"
                    "       (lists:seq(1,17),"
@@ -2404,10 +2419,6 @@ otp_6554(Config) when is_list(Config) ->
 
     ?line "exception error: no function clause matching" = 
         comm_err(<<"fun(P, q) when is_pid(P) -> true end(a, b).">>),
-    ?line "exception error: no function clause matching lists:reverse(" ++ _ = 
-        comm_err(<<"F=fun() -> hello end, lists:reverse(F).">>),
-    ?line "exception error: no function clause matching lists:reverse(34) (lists.erl, line " ++ _ = 
-        comm_err(<<"lists:reverse(34).">>),
     ?line "exception error: no true branch found when evaluating an if expression" = 
         comm_err(<<"if length([a,b]) > 17 -> a end.">>),
     ?line "exception error: no such process or port" = 
diff --git a/lib/stdlib/test/sofs_SUITE.erl b/lib/stdlib/test/sofs_SUITE.erl
index 73b282149a..c8dca9a6e6 100644
--- a/lib/stdlib/test/sofs_SUITE.erl
+++ b/lib/stdlib/test/sofs_SUITE.erl
@@ -1879,12 +1879,9 @@ digraph(Conf) when is_list(Conf) ->
 
     ?line {'EXIT', {badarg, _}} = 
         (catch family_to_digraph(set([a]))),
-    ?line {'EXIT', {badarg, [{sofs,family_to_digraph,[_,_],_}|_]}} =
-        (catch family_to_digraph(set([a]), [foo])),
-    ?line {'EXIT', {badarg, [{sofs,family_to_digraph,[_,_],_}|_]}} =
-        (catch family_to_digraph(F, [foo])),
-    ?line {'EXIT', {cyclic, [{sofs,family_to_digraph,[_,_],_}|_]}} =
-        (catch family_to_digraph(family([{a,[a]}]),[acyclic])),
+    digraph_fail(badarg, catch family_to_digraph(set([a]), [foo])),
+    digraph_fail(badarg, catch family_to_digraph(F, [foo])),
+    digraph_fail(cyclic, catch family_to_digraph(family([{a,[a]}]),[acyclic])),
 
     ?line G1 = family_to_digraph(E),
     ?line {'EXIT', {badarg, _}} = (catch digraph_to_family(G1, foo)),
@@ -1927,6 +1924,13 @@ digraph(Conf) when is_list(Conf) ->
     ?line true = T0 == ets:all(),
     ok.
 
+digraph_fail(ExitReason, Fail) ->
+    {'EXIT', {ExitReason, [{sofs,family_to_digraph,A,_}|_]}} = Fail,
+    case {test_server:is_native(sofs),A} of
+	{false,[_,_]} -> ok;
+	{true,2} -> ok
+    end.
+
 constant_function(suite) -> [];
 constant_function(doc) -> [""];
 constant_function(Conf) when is_list(Conf) ->
@@ -1954,6 +1958,17 @@ misc(Conf) when is_list(Conf) ->
                difference(S, RR)),
 
     %% The function external:foo/1 is undefined.
+    case test_server:is_native(sofs) of
+	true ->
+	    %% Create an export entry for external:foo/1 to work
+	    %% around a bug in the native code. If there is no
+	    %% export entry, the exception will be
+	    %% {badfun,{external,foo}}. Remove in R16 when tuple
+	    %% funs are removed.
+	    (catch external:foo([]));
+	false ->
+	    ok
+    end,
     ?line {'EXIT', {undef, _}} =    
  	(catch projection({external,foo}, set([a,b,c]))),
     ok.
diff --git a/lib/tools/test/fprof_SUITE.erl b/lib/tools/test/fprof_SUITE.erl
index 0da6d4a9ea..f491c1e227 100644
--- a/lib/tools/test/fprof_SUITE.erl
+++ b/lib/tools/test/fprof_SUITE.erl
@@ -191,11 +191,17 @@ tail_seq(Config) when is_list(Config) ->
 
 %%%---------------------------------------------------------------------
 
-create_file_slow(doc) ->
-    ["Tests the create_file_slow benchmark"];
-create_file_slow(suite) ->
-    [];
-create_file_slow(Config) when is_list(Config) ->
+%% Tests the create_file_slow benchmark.
+create_file_slow(Config) ->
+    case test_server:is_native(lists) orelse
+	test_server:is_native(file) of
+	true ->
+	    {skip,"Native libs -- tracing does not work"};
+	false ->
+	    do_create_file_slow(Config)
+    end.
+
+do_create_file_slow(Config) ->
     ?line Timetrap = ?t:timetrap(?t:seconds(40)),
     ?line PrivDir = ?config(priv_dir, Config),
     ?line TraceFile =