diff options
| author | Lukas Larsson <[email protected]> | 2011-09-29 17:54:27 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2011-09-29 17:54:27 +0200 |
| commit | 71099221fc8d0456fb38b1954e9053ec527d43b2 (patch) | |
| tree | 6e0b29ded24837b7e31c1ddcd0df5608c1af199e /lib/kernel/test/inet_SUITE.erl | |
| parent | fbf611254ded96a0bbeedb76b895f39958b04edc (diff) | |
| parent | 1be1c1cb15068aed40a30210c8be34f36e38ed66 (diff) | |
| download | otp-71099221fc8d0456fb38b1954e9053ec527d43b2.tar.gz otp-71099221fc8d0456fb38b1954e9053ec527d43b2.tar.bz2 otp-71099221fc8d0456fb38b1954e9053ec527d43b2.zip | |
Merge branch 'dev' into major
* dev:
Skip create_big_boot on platforms without crypto
Remove test_server path instead of cwd for clash test
Skip getaddr_v6 test if on the ipv4_only host
Use static port for old solaris versions
Extend time to wait for zone files to be loaded
Allow out of memory exception for max_port checks
Extend slave start timeout for windows tests
Double timeout to make sure debug builds pass
Use now instead of os:timestamp
Increase timeout in scheduler_suspend for slow platforms
Skip update_cpu_info if 'taskset' cannot be found
Diffstat (limited to 'lib/kernel/test/inet_SUITE.erl')
| -rw-r--r-- | lib/kernel/test/inet_SUITE.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/kernel/test/inet_SUITE.erl b/lib/kernel/test/inet_SUITE.erl index 1bb173a3ac..aaa20b7398 100644 --- a/lib/kernel/test/inet_SUITE.erl +++ b/lib/kernel/test/inet_SUITE.erl @@ -294,7 +294,7 @@ t_getaddr_v6(Config) when is_list(Config) -> ?line {Name,FullName,IPStr,_IP,_,IP_46_Str,IP46} = ct:get_config(test_host_ipv4_only), case {inet:getaddr(IP_46_Str, inet6),inet:getaddr(Name, inet6)} of - {{ok,IP46},{ok,_}} -> + {{ok,IP46},{ok,V4Addr}} when V4Addr /= {0,0,0,0,0,0,0,1} -> %% Since we suceeded in parsing an IPv6 address string and %% look up the name, this computer fully supports IPv6. ?line {ok,IP46} = inet:getaddr(IP46, inet6), |