Make these socket tests less Linux-specific

diff --git a/ext/sockets/tests/socket_create_listen.phpt b/ext/sockets/tests/socket_create_listen.phpt
index 6d607cab6fab3f58f38df3adb2ec967c465856f1..440fade61d9f306e45596b91de6b44e509f2520c 100644 (file)
--- a/ext/sockets/tests/socket_create_listen.phpt
+++ b/ext/sockets/tests/socket_create_listen.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test if socket binds on 31337
+Test if socket binds on 31338
 --SKIPIF--
 <?php
 if (!extension_loaded('sockets')) {
@@ -7,12 +7,12 @@ if (!extension_loaded('sockets')) {
 }
 --FILE--
 <?php
-$sock = socket_create_listen(31337);
+$sock = socket_create_listen(31338);
 socket_getsockname($sock, $addr, $port); 
 var_dump($addr, $port);
 --EXPECT--
 string(7) "0.0.0.0"
-int(31337)
+int(31338)
 --CREDITS--
 Till Klampaeckel, till@php.net
 PHP Testfest Berlin 2009-05-09

diff --git a/ext/sockets/tests/socket_create_pair-wrongparams.phpt b/ext/sockets/tests/socket_create_pair-wrongparams.phpt
index 64c5048eda643144da09774c2eaf47480c785157..99512bcc3b45696f0121133839dcbff4b8c78176 100644 (file)
--- a/ext/sockets/tests/socket_create_pair-wrongparams.phpt
+++ b/ext/sockets/tests/socket_create_pair-wrongparams.phpt
@@ -24,17 +24,17 @@ NULL
 Warning: socket_create_pair() expects parameter 1 to be long, %unicode_string_optional% given in %s on line %d
 NULL
 
-Warning: socket_create_pair(): unable to create socket pair [94]: Socket type not supported in %s on line %d
+Warning: socket_create_pair(): unable to create socket pair [%d]: %s not supported in %s on line %d
 bool(false)
 
 Warning: socket_create_pair(): invalid socket domain [31337] specified for argument 1, assuming AF_INET in %s on line %d
 
-Warning: socket_create_pair(): unable to create socket pair [94]: Socket type not supported in %s on line %d
+Warning: socket_create_pair(): unable to create socket pair [%d]: %s not supported in %s on line %d
 bool(false)
 
 Warning: socket_create_pair(): invalid socket type [31337] specified for argument 2, assuming SOCK_STREAM in %s on line %d
 
-Warning: socket_create_pair(): unable to create socket pair [95]: Operation not supported in %s on line %d
+Warning: socket_create_pair(): unable to create socket pair [%d]: %s not supported %s on line %d
 bool(false)
 --CREDITS--
 Till Klampaeckel, till@php.net

diff --git a/ext/sockets/tests/socket_sentto_recvfrom_ipv4_udp.phpt b/ext/sockets/tests/socket_sentto_recvfrom_ipv4_udp.phpt
index 64b657a485f58e73f553bbaab6d30c2111250dc2..8b7ed0bd31d89dd40664d4000e979777329f0c86 100644 (file)
--- a/ext/sockets/tests/socket_sentto_recvfrom_ipv4_udp.phpt
+++ b/ext/sockets/tests/socket_sentto_recvfrom_ipv4_udp.phpt
@@ -44,7 +44,7 @@ if (!extension_loaded('sockets')) {
 
     socket_close($socket);
 --EXPECTF--
-Warning: socket_recvfrom(): unable to recvfrom [11]: Resource temporarily unavailable in %s on line %d
+Warning: socket_recvfrom(): unable to recvfrom [%d]: Resource temporarily unavailable in %s on line %d
 
 Warning: Wrong parameter count for socket_sendto() in %s on line %d
 

diff --git a/ext/sockets/tests/socket_sentto_recvfrom_unix.phpt b/ext/sockets/tests/socket_sentto_recvfrom_unix.phpt
index 708d224cadcd7e934aaaff04503227ebfe6102ea..ab111898b432169f4026f1603cd5f1d9a24e724b 100644 (file)
--- a/ext/sockets/tests/socket_sentto_recvfrom_unix.phpt
+++ b/ext/sockets/tests/socket_sentto_recvfrom_unix.phpt
@@ -49,9 +49,9 @@ if (!extension_loaded('sockets')) {
        @unlink($address);
 ?>
 --EXPECTF--
-Warning: socket_create(): Unable to create socket [93]: Protocol not supported in %s on line %d
+Warning: socket_create(): Unable to create socket [%d]: Protocol not supported in %s on line %d
 
-Warning: socket_recvfrom(): unable to recvfrom [11]: Resource temporarily unavailable in %s on line %d
+Warning: socket_recvfrom(): unable to recvfrom [%d]: Resource temporarily unavailable in %s on line %d
 
 Warning: socket_sendto() expects at least 5 parameters, 4 given in %s on line %d
 bool(false)

diff --git a/ext/sockets/tests/socket_set_block-retval.phpt b/ext/sockets/tests/socket_set_block-retval.phpt
index fe09d5a5b7851b43c04731f5183fd26b5b03a123..2aa4b0e5c41db0a589b48ac06ebfb8cc467f0182 100644 (file)
--- a/ext/sockets/tests/socket_set_block-retval.phpt
+++ b/ext/sockets/tests/socket_set_block-retval.phpt
@@ -9,11 +9,11 @@ if (!extension_loaded('sockets')) {
 --FILE--
 <?php
 
-$socket = socket_create_listen(31337);
+$socket = socket_create_listen(31339);
 var_dump(socket_set_block($socket));
 socket_close($socket);
 
-$socket2 = socket_create_listen(31338);
+$socket2 = socket_create_listen(31340);
 socket_close($socket2);
 var_dump(socket_set_block($socket2));
 

diff --git a/ext/sockets/tests/socket_set_nonblock-retval.phpt b/ext/sockets/tests/socket_set_nonblock-retval.phpt
index 3c4b5151a073632874aac5ff8f418c0173545391..b90861859abb59b9293e34b52508c00afeacf268 100644 (file)
--- a/ext/sockets/tests/socket_set_nonblock-retval.phpt
+++ b/ext/sockets/tests/socket_set_nonblock-retval.phpt
@@ -9,11 +9,11 @@ if (!extension_loaded('sockets')) {
 --FILE--
 <?php
 
-$socket = socket_create_listen(31337);
+$socket = socket_create_listen(31339);
 var_dump(socket_set_nonblock($socket));
 socket_close($socket);
 
-$socket2 = socket_create_listen(31338);
+$socket2 = socket_create_listen(31340);
 socket_close($socket2);
 var_dump(socket_set_nonblock($socket2));