fix and new test for sunos

diff --git a/ext/standard/tests/file/popen_pclose_error-sunos.phpt b/ext/standard/tests/file/popen_pclose_error-sunos.phpt
new file mode 100644 (file)
index 0000000..76b5ac2
--- /dev/null
+++ b/ext/standard/tests/file/popen_pclose_error-sunos.phpt
@@ -0,0 +1,74 @@
+--TEST--
+Test popen() and pclose function: error conditions
+--SKIPIF--
+<?php
+if( strtoupper( substr(PHP_OS, 0, 3) ) != 'SUN' )
+  die("skip Only Valid for Sun Solaris");
+?>
+
+--FILE--
+<?php
+/*
+ * Prototype: resource popen ( string command, string mode )
+ * Description: Opens process file pointer.
+
+ * Prototype: int pclose ( resource handle );
+ * Description: Closes process file pointer.
+ */
+$file_path = dirname(__FILE__);
+echo "*** Testing for error conditions ***\n";
+var_dump( popen() );  // Zero Arguments
+var_dump( popen("abc.txt") );   // Single Argument
+var_dump( popen("abc.txt", "rw") );   // Invalid mode Argument
+var_dump( pclose() );
+$file_handle = fopen($file_path."/popen.tmp", "w");
+var_dump( pclose($file_handle, $file_handle) );
+fclose($file_handle);
+var_dump( pclose(1) );
+echo "\n--- Done ---";
+?>
+--CLEAN--
+<?php
+$file_path = dirname(__FILE__);
+unlink($file_path."/popen.tmp");
+?>
+--EXPECTF--
+*** Testing for error conditions ***
+
+Warning: popen() expects exactly 2 parameters, 0 given in %s on line %d
+NULL
+
+Warning: popen() expects exactly 2 parameters, 1 given in %s on line %d
+NULL
+resource(%d) of type (stream)
+sh: abc.txt: not found
+Warning: Wrong parameter count for pclose() in %s on line %d
+NULL
+
+Warning: Wrong parameter count for pclose() in %s on line %d
+NULL
+
+Warning: pclose(): supplied argument is not a valid stream resource in %s on line %d
+bool(false)
+
+--- Done ---
+--UEXPECTF--
+*** Testing for error conditions ***
+
+Warning: popen() expects exactly 2 parameters, 0 given in %s on line %d
+NULL
+
+Warning: popen() expects exactly 2 parameters, 1 given in %s on line %d
+NULL
+resource(%d) of type (stream)
+sh: abc.txt: not found
+Warning: Wrong parameter count for pclose() in %s on line %d
+NULL
+
+Warning: Wrong parameter count for pclose() in %s on line %d
+NULL
+
+Warning: pclose(): supplied argument is not a valid stream resource in %s on line %d
+bool(false)
+
+--- Done ---

diff --git a/ext/standard/tests/file/popen_pclose_error.phpt b/ext/standard/tests/file/popen_pclose_error.phpt
index fbd139c668097bece9cb5cc12fa2550b919aaf84..f6932f108ed5c25e03b92dc4f87652aef026caeb 100644 (file)
--- a/ext/standard/tests/file/popen_pclose_error.phpt
+++ b/ext/standard/tests/file/popen_pclose_error.phpt
@@ -2,8 +2,8 @@
 Test popen() and pclose function: error conditions
 --SKIPIF--
 <?php
-if(substr(PHP_OS, 0, 3) == 'WIN' )
-  die("skip Not Valid for Windows");
+if(substr(PHP_OS, 0, 3) == 'WIN' || strtoupper( substr(PHP_OS, 0, 3) ) == 'SUN')
+  die("skip Not Valid for Windows & Sun Solaris");
 ?>
 
 --FILE--
@@ -41,7 +41,7 @@ NULL
 Warning: popen() expects exactly 2 parameters, 1 given in %s on line %d
 NULL
 
-Warning: popen(abc.txt,rw): Invalid argument in %s on line %d
+Warning: popen(abc.txt,rw): %s on line %d
 bool(false)
 
 Warning: Wrong parameter count for pclose() in %s on line %d
@@ -63,7 +63,7 @@ NULL
 Warning: popen() expects exactly 2 parameters, 1 given in %s on line %d
 NULL
 
-Warning: popen(abc.txt,rw): Invalid argument in %s on line %d
+Warning: popen(abc.txt,rw): %s on line %d
 bool(false)
 
 Warning: Wrong parameter count for pclose() in %s on line %d