diff options
author | Arnaud Le Blanc <lbarnaud@php.net> | 2009-05-20 09:13:29 +0000 |
---|---|---|
committer | Arnaud Le Blanc <lbarnaud@php.net> | 2009-05-20 09:13:29 +0000 |
commit | 808acd6b64f4564fd2c52c8fce55bb9cc2d45dff (patch) | |
tree | 04f289dc1d97d22d6e3e4a4f06e2b151c49c9964 | |
parent | 73553e8c773f0b4e868fbd037aba98d01be8721f (diff) | |
download | php-git-808acd6b64f4564fd2c52c8fce55bb9cc2d45dff.tar.gz |
MFH: Fix skipif
-rw-r--r-- | ext/sockets/tests/ipv6_skipif.inc | 8 | ||||
-rw-r--r-- | ext/sockets/tests/ipv6loop.phpt | 4 | ||||
-rw-r--r-- | ext/sockets/tests/socket_sentto_recvfrom_ipv6_udp.phpt | 1 |
3 files changed, 10 insertions, 3 deletions
diff --git a/ext/sockets/tests/ipv6_skipif.inc b/ext/sockets/tests/ipv6_skipif.inc new file mode 100644 index 0000000000..ad8cf77b35 --- /dev/null +++ b/ext/sockets/tests/ipv6_skipif.inc @@ -0,0 +1,8 @@ +<?php +if (!defined("AF_INET6")) { + die('skip no IPv6 support'); +} +/* If IPv6 is supported on the platform this will error out with code 111 - Connection refused. + If IPv6 is NOT supported, $errno will be set to something else (indicating parse/getaddrinfo error) */ +@stream_socket_client('tcp://[::1]:0', $errno); +if ($errno != 111) die('skip no IPv6 support'); diff --git a/ext/sockets/tests/ipv6loop.phpt b/ext/sockets/tests/ipv6loop.phpt index 6fb584045f..6967605ffa 100644 --- a/ext/sockets/tests/ipv6loop.phpt +++ b/ext/sockets/tests/ipv6loop.phpt @@ -5,9 +5,7 @@ IPv6 Loopback test if (!extension_loaded('sockets')) { die('skip sockets extension not available.'); } - if (!defined("AF_INET6")) { - die('skip no IPv6 support'); - } + require 'ipv6_skipif.inc'; ?> --FILE-- <?php diff --git a/ext/sockets/tests/socket_sentto_recvfrom_ipv6_udp.phpt b/ext/sockets/tests/socket_sentto_recvfrom_ipv6_udp.phpt index 5b8b742f3f..1fa42fd5da 100644 --- a/ext/sockets/tests/socket_sentto_recvfrom_ipv6_udp.phpt +++ b/ext/sockets/tests/socket_sentto_recvfrom_ipv6_udp.phpt @@ -5,6 +5,7 @@ Test if socket_recvfrom() receives data sent by socket_sendto() via IPv6 UDP if (!extension_loaded('sockets')) { die('SKIP The sockets extension is not loaded.'); } +require 'ipv6_skipif.inc'; --FILE-- <?php $socket = socket_create(AF_INET6, SOCK_DGRAM, SOL_UDP); |