From 8e47365a97892780444bf331642fbdd8d269790a Mon Sep 17 00:00:00 2001
From: Eyal Teutsch <eyalt@php.net>
Date: Sun, 26 Dec 2010 13:10:23 +0000
Subject: [PATCH] fixed 6 tests to pass on non-linux os, by removing the
 generic linux error string from the exp result. on socket_strerror on the
 other hand, added to the SKIPIF a condition to run on linux only, as the test
 checks specifically various error strings

---
 ext/sockets/tests/socket_connect_params.phpt           | 2 +-
 ext/sockets/tests/socket_create_listen_used.phpt       | 2 +-
 ext/sockets/tests/socket_getpeername.phpt              | 2 +-
 ext/sockets/tests/socket_read_params.phpt              | 2 +-
 ext/sockets/tests/socket_sentto_recvfrom_ipv4_udp.phpt | 2 +-
 ext/sockets/tests/socket_strerror.phpt                 | 3 +++
 ext/sockets/tests/socket_write_params.phpt             | 2 +-
 7 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/ext/sockets/tests/socket_connect_params.phpt b/ext/sockets/tests/socket_connect_params.phpt
index c8dff06e8e..44f0ffdf51 100644
--- a/ext/sockets/tests/socket_connect_params.phpt
+++ b/ext/sockets/tests/socket_connect_params.phpt
@@ -30,4 +30,4 @@ Warning: socket_connect() expects at least 2 parameters, 1 given in %s on line %
 
 Warning: socket_connect(): Socket of type AF_INET requires 3 arguments in %s on line %i
 
-Warning: socket_connect(): unable to connect [%i]: Transport endpoint is already connected in %s on line %i
+Warning: socket_connect(): unable to connect [%i]: %a in %s on line %i
diff --git a/ext/sockets/tests/socket_create_listen_used.phpt b/ext/sockets/tests/socket_create_listen_used.phpt
index d89f1b70e8..1e45f82511 100644
--- a/ext/sockets/tests/socket_create_listen_used.phpt
+++ b/ext/sockets/tests/socket_create_listen_used.phpt
@@ -24,7 +24,7 @@ fa@php.net
 --EXPECTF--
 resource(%i) of type (Socket)
 
-Warning: socket_create_listen(): unable to bind to given address [%i]: Address already in use in %s on line %i
+Warning: socket_create_listen(): unable to bind to given address [%i]: %a in %s on line %i
 bool(false)
 
 Warning: socket_close() expects parameter 1 to be resource, boolean given in %s on line %i
diff --git a/ext/sockets/tests/socket_getpeername.phpt b/ext/sockets/tests/socket_getpeername.phpt
index 2252992c02..280fa2a1aa 100644
--- a/ext/sockets/tests/socket_getpeername.phpt
+++ b/ext/sockets/tests/socket_getpeername.phpt
@@ -27,7 +27,7 @@ fa@php.net
 --EXPECTF--
 bool(true)
 
-Warning: socket_getpeername(): unable to retrieve peer name [%i]: Transport endpoint is not connected in %s on line %i
+Warning: socket_getpeername(): unable to retrieve peer name [%i]: %a in %s on line %i
 bool(false)
 NULL
 NULL
diff --git a/ext/sockets/tests/socket_read_params.phpt b/ext/sockets/tests/socket_read_params.phpt
index 69af710ca6..3b4821ac4e 100644
--- a/ext/sockets/tests/socket_read_params.phpt
+++ b/ext/sockets/tests/socket_read_params.phpt
@@ -25,4 +25,4 @@ Warning: socket_read() expects at least 2 parameters, 0 given in %s on line %i
 
 Warning: socket_read() expects at least 2 parameters, 1 given in %s on line %i
 
-Warning: socket_read(): unable to read from socket [%i]: Transport endpoint is not connected in %s on line %i
+Warning: socket_read(): unable to read from socket [%i]: %a in %s on line %i
diff --git a/ext/sockets/tests/socket_sentto_recvfrom_ipv4_udp.phpt b/ext/sockets/tests/socket_sentto_recvfrom_ipv4_udp.phpt
index 8b7ed0bd31..96cbf8f4db 100644
--- 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 [%d]: Resource temporarily unavailable in %s on line %d
+Warning: socket_recvfrom(): unable to recvfrom [%d]: %a in %s on line %d
 
 Warning: Wrong parameter count for socket_sendto() in %s on line %d
 
diff --git a/ext/sockets/tests/socket_strerror.phpt b/ext/sockets/tests/socket_strerror.phpt
index 074d2ff7f6..d1759c582c 100644
--- a/ext/sockets/tests/socket_strerror.phpt
+++ b/ext/sockets/tests/socket_strerror.phpt
@@ -8,6 +8,9 @@ fa@php.net
     if (!extension_loaded('sockets')) {
         die('skip sockets extension not available.');
     }
+    if (!stristr(PHP_OS, "linux") {
+        die('skip - test validtes linux error strings only.');
+    }
 ?>
 --FILE--
 <?php
diff --git a/ext/sockets/tests/socket_write_params.phpt b/ext/sockets/tests/socket_write_params.phpt
index e23766ea62..00360f7be4 100644
--- a/ext/sockets/tests/socket_write_params.phpt
+++ b/ext/sockets/tests/socket_write_params.phpt
@@ -25,4 +25,4 @@ Warning: socket_write() expects at least 2 parameters, 0 given in %s on line %i
 
 Warning: socket_write() expects at least 2 parameters, 1 given in %s on line %i
 
-Warning: socket_write(): unable to write to socket [%i]: Broken pipe in %s on line %i
+Warning: socket_write(): unable to write to socket [%i]: %a in %s on line %i
-- 
2.40.0