summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXinchen Hui <laruence@php.net>2013-03-05 16:56:00 +0800
committerXinchen Hui <laruence@php.net>2013-03-05 16:56:00 +0800
commite5d0dc24d268cbf2aabdb9e48135385f01b21765 (patch)
tree278ecaa6649d04182ce09972106dabbbaa121b66
parent1978dae3095d6f02cbcb964142802fd0f3a7ee16 (diff)
downloadphp-git-e5d0dc24d268cbf2aabdb9e48135385f01b21765.tar.gz
Fix tests temporary
seems IPV6_PKTINFO are not avaiable in some OS
-rw-r--r--ext/sockets/tests/socket_recvmsg.phpt7
-rw-r--r--ext/sockets/tests/socket_sendrecvmsg_multi_msg.phpt6
-rw-r--r--ext/sockets/tests/socket_set_option_in6_pktinfo.phpt13
3 files changed, 18 insertions, 8 deletions
diff --git a/ext/sockets/tests/socket_recvmsg.phpt b/ext/sockets/tests/socket_recvmsg.phpt
index 30263a4fbd..cbdb5280c2 100644
--- a/ext/sockets/tests/socket_recvmsg.phpt
+++ b/ext/sockets/tests/socket_recvmsg.phpt
@@ -3,10 +3,13 @@ recvmsg(): basic test
--SKIPIF--
<?php
if (!extension_loaded('sockets')) {
-die('skip sockets extension not available.');
+ die('skip sockets extension not available.');
}
if (!defined('IPPROTO_IPV6')) {
-die('skip IPv6 not available.');
+ die('skip IPv6 not available.');
+}
+if (!defined('IPV6_RECVPKTINFO')) {
+ die('skip IPV6_RECVPKTINFO not available.');
}
--FILE--
diff --git a/ext/sockets/tests/socket_sendrecvmsg_multi_msg.phpt b/ext/sockets/tests/socket_sendrecvmsg_multi_msg.phpt
index 212f7e186f..44e25f021a 100644
--- a/ext/sockets/tests/socket_sendrecvmsg_multi_msg.phpt
+++ b/ext/sockets/tests/socket_sendrecvmsg_multi_msg.phpt
@@ -6,12 +6,16 @@ if (!extension_loaded('sockets'))
die('skip sockets extension not available.');
if (!defined('IPPROTO_IPV6'))
die('skip IPv6 not available.');
-if (substr(PHP_OS, 0, 3) == 'WIN')
+if (substr(PHP_OS, 0, 3) == 'WIN')
die('skip Not for the Windows!');
/* Windows supports IPV6_RECVTCLASS and is able to receive the tclass via
* WSARecvMsg (though only the top 6 bits seem to reported), but WSASendMsg
* does not accept IPV6_TCLASS messages */
+if (!defined('IPV6_RECVPKTINFO')) {
+ die('skip IPV6_RECVPKTINFO not available.');
+}
+
--FILE--
<?php
include __DIR__."/mcast_helpers.php.inc";
diff --git a/ext/sockets/tests/socket_set_option_in6_pktinfo.phpt b/ext/sockets/tests/socket_set_option_in6_pktinfo.phpt
index 27b6ae59c5..aa6d5ae062 100644
--- a/ext/sockets/tests/socket_set_option_in6_pktinfo.phpt
+++ b/ext/sockets/tests/socket_set_option_in6_pktinfo.phpt
@@ -3,13 +3,17 @@ socket_set_option() with IPV6_PKTINFO
--SKIPIF--
<?php
if (!extension_loaded('sockets')) {
-die('skip sockets extension not available.');
+ die('skip sockets extension not available.');
}
if (!defined('IPPROTO_IPV6')) {
-die('skip IPv6 not available.');
+ die('skip IPv6 not available.');
}
-if (substr(PHP_OS, 0, 3) == 'WIN')
- die('skip Not for Windows!');
+if (substr(PHP_OS, 0, 3) == 'WIN') {
+ die('skip Not for Windows!');
+}
+if (!defined('IPV6_PKTINFO')) {
+ die('skip IPV6_PKTINFO not available.');
+}
--FILE--
<?php
@@ -29,4 +33,3 @@ var_dump(socket_set_option($s, IPPROTO_IPV6, IPV6_PKTINFO, [
Warning: socket_set_option(): error converting user data (path: in6_pktinfo): The key 'addr' is required in %s on line %d
bool(false)
bool(true)
-