Commit:    082741814adc343c7f964e42a5a544516d884d75
Author:    Xinchen Hui <larue...@php.net>         Tue, 5 Mar 2013 17:18:13 +0800
Parents:   e5d0dc24d268cbf2aabdb9e48135385f01b21765
Branches:  PHP-5.5

Link:       
http://git.php.net/?p=php-src.git;a=commitdiff;h=082741814adc343c7f964e42a5a544516d884d75

Log:
skip if no IPv6 support

Changed paths:
  M  ext/sockets/tests/socket_recvmsg.phpt
  M  ext/sockets/tests/socket_sendrecvmsg_multi_msg.phpt
  M  ext/sockets/tests/socket_set_option_in6_pktinfo.phpt


Diff:
diff --git a/ext/sockets/tests/socket_recvmsg.phpt 
b/ext/sockets/tests/socket_recvmsg.phpt
index cbdb528..a220411 100644
--- a/ext/sockets/tests/socket_recvmsg.phpt
+++ b/ext/sockets/tests/socket_recvmsg.phpt
@@ -5,13 +5,16 @@ recvmsg(): basic test
 if (!extension_loaded('sockets')) {
     die('skip sockets extension not available.');
 }
+
+require 'ipv6_skipif.inc';
+
 if (!defined('IPPROTO_IPV6')) {
     die('skip IPv6 not available.');
 }
 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_sendrecvmsg_multi_msg.phpt 
b/ext/sockets/tests/socket_sendrecvmsg_multi_msg.phpt
index 44e25f0..6b46f33 100644
--- a/ext/sockets/tests/socket_sendrecvmsg_multi_msg.phpt
+++ b/ext/sockets/tests/socket_sendrecvmsg_multi_msg.phpt
@@ -4,6 +4,9 @@ sendmsg()/recvmsg(): test ability to receive multiple messages
 <?php
 if (!extension_loaded('sockets'))
        die('skip sockets extension not available.');
+
+require 'ipv6_skipif.inc';
+
 if (!defined('IPPROTO_IPV6'))
        die('skip IPv6 not available.');
 if (substr(PHP_OS, 0, 3) == 'WIN') 
@@ -15,7 +18,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN')
 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 aa6d5ae..75019ca 100644
--- a/ext/sockets/tests/socket_set_option_in6_pktinfo.phpt
+++ b/ext/sockets/tests/socket_set_option_in6_pktinfo.phpt
@@ -5,6 +5,9 @@ socket_set_option() with IPV6_PKTINFO
 if (!extension_loaded('sockets')) {
     die('skip sockets extension not available.');
 }
+
+require 'ipv6_skipif.inc';
+
 if (!defined('IPPROTO_IPV6')) {
     die('skip IPv6 not available.');
 }


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to