aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kernel
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2012-02-07 08:42:14 +0100
committerBjörn Gustavsson <[email protected]>2012-02-07 08:42:14 +0100
commitee20527da3c90d1f7c10e7702237f9c71e23a3cd (patch)
tree66f1ddbef7c609bd955e6708e72a43da903017eb /lib/kernel
parent59243ad0651d09347d2fc11cb0dbc16e9ec767ba (diff)
parentd4332565d1a6480fe46fd72284e39dbf4670327e (diff)
downloadotp-ee20527da3c90d1f7c10e7702237f9c71e23a3cd.tar.gz
otp-ee20527da3c90d1f7c10e7702237f9c71e23a3cd.tar.bz2
otp-ee20527da3c90d1f7c10e7702237f9c71e23a3cd.zip
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
Diffstat (limited to 'lib/kernel')
-rw-r--r--lib/kernel/test/erl_prim_loader_SUITE.erl8
1 files changed, 4 insertions, 4 deletions
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()),