diff options
| author | Micael Karlberg <[email protected]> | 2011-06-01 17:23:12 +0200 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2011-06-15 18:16:19 +0200 |
| commit | 6d3f12f6921155ffbe5e5e5b84734657be97ff1c (patch) | |
| tree | fb199af585d7305115aa23d0903da33431b1a51a /lib/inets/test/inets_test_lib.erl | |
| parent | 1e69822bac15f0a3eb4084fb56beb1bb6d7decd8 (diff) | |
| download | otp-6d3f12f6921155ffbe5e5e5b84734657be97ff1c.tar.gz otp-6d3f12f6921155ffbe5e5e5b84734657be97ff1c.tar.bz2 otp-6d3f12f6921155ffbe5e5e5b84734657be97ff1c.zip | |
SSL with IPv6 now works "in principle".
Diffstat (limited to 'lib/inets/test/inets_test_lib.erl')
| -rw-r--r-- | lib/inets/test/inets_test_lib.erl | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/lib/inets/test/inets_test_lib.erl b/lib/inets/test/inets_test_lib.erl index 6cedaf9638..c4b220dd2f 100644 --- a/lib/inets/test/inets_test_lib.erl +++ b/lib/inets/test/inets_test_lib.erl @@ -31,13 +31,22 @@ -export([info/4, log/4, debug/4, print/4]). -export([check_body/1]). -export([millis/0, millis_diff/2, hours/1, minutes/1, seconds/1, sleep/1]). --export([oscmd/1]). +-export([oscmd/1, has_ipv6_support/0]). -export([non_pc_tc_maybe_skip/4, os_based_skip/1, skip/3, fail/3]). -export([flush/0]). -export([start_node/1, stop_node/1]). %% -- Misc os command and stuff +has_ipv6_support() -> + {ok, Hostname} = inet:gethostname(), + case inet:getaddrs(Hostname, inet6) of + {ok, [Addr|_]} -> + {ok, Addr}; + _ -> + undefined + end. + oscmd(Cmd) -> string:strip(os:cmd(Cmd), right, $\n). |