diff options
| author | Niclas Eklund <[email protected]> | 2011-01-25 15:00:26 +0100 |
|---|---|---|
| committer | Niclas Eklund <[email protected]> | 2011-01-25 15:00:26 +0100 |
| commit | 14c9ff21544da8b5e195601ea21f9c954ee847da (patch) | |
| tree | 0d5e354eea398d99d99217726572e3e56eebe85b /lib/orber/test/orber_test_lib.erl | |
| parent | 2a49028427217bb7574274280524edee1e7f5d4d (diff) | |
| parent | f0168539740f650cb8a7ef0bf8b51facc40c1563 (diff) | |
| download | otp-14c9ff21544da8b5e195601ea21f9c954ee847da.tar.gz otp-14c9ff21544da8b5e195601ea21f9c954ee847da.tar.bz2 otp-14c9ff21544da8b5e195601ea21f9c954ee847da.zip | |
Merge branch 'maint-r14' into dev
Diffstat (limited to 'lib/orber/test/orber_test_lib.erl')
| -rw-r--r-- | lib/orber/test/orber_test_lib.erl | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/lib/orber/test/orber_test_lib.erl b/lib/orber/test/orber_test_lib.erl index b95cf4b0ec..132f02bb78 100644 --- a/lib/orber/test/orber_test_lib.erl +++ b/lib/orber/test/orber_test_lib.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1999-2010. All Rights Reserved. +%% Copyright Ericsson AB 1999-2011. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -126,13 +126,22 @@ version_ok() -> _ -> case gen_tcp:listen(0, [{reuseaddr, true}, inet6]) of {ok, LSock} -> - gen_tcp:close(LSock), - true; + {ok, Port} = inet:port(LSock), + case gen_tcp:connect(Hostname, Port, [inet6]) of + {error, _} -> + gen_tcp:close(LSock), + {skipped, "Inet cannot handle IPv6"}; + {ok, Socket} -> + gen_tcp:close(Socket), + gen_tcp:close(LSock), + true + end; {error, _} -> {skipped, "Inet cannot handle IPv6"} end end end. + %%------------------------------------------------------------ %% function : get_host %% Arguments: Family - inet | inet6 |