Modified: php/php-src/branches/PHP_5_2/Zend/tests/function_exists_error.phpt
===================================================================
--- php/php-src/branches/PHP_5_2/Zend/tests/function_exists_error.phpt	2009-07-21 13:57:33 UTC (rev 284537)
+++ php/php-src/branches/PHP_5_2/Zend/tests/function_exists_error.phpt	2009-07-21 14:02:24 UTC (rev 284538)
@@ -1,6 +1,5 @@
 --TEST--
 Test function_exists() function : error conditions
---INI--
 --FILE--
 <?php
 /*

Modified: php/php-src/branches/PHP_5_2/ext/pcre/tests/preg_split_basic.phpt
===================================================================
--- php/php-src/branches/PHP_5_2/ext/pcre/tests/preg_split_basic.phpt	2009-07-21 13:57:33 UTC (rev 284537)
+++ php/php-src/branches/PHP_5_2/ext/pcre/tests/preg_split_basic.phpt	2009-07-21 14:02:24 UTC (rev 284538)
@@ -1,6 +1,5 @@
 --TEST--
 Test preg_split() function : basic functionality
---INI--
 --FILE--
 <?php
 /*
@@ -73,4 +72,4 @@
   string(1) "("
   [9]=>
   string(1) ")"
-}
\ No newline at end of file
+}

Modified: php/php-src/branches/PHP_5_2/ext/posix/tests/posix_getcwd.phpt
===================================================================
--- php/php-src/branches/PHP_5_2/ext/posix/tests/posix_getcwd.phpt	2009-07-21 13:57:33 UTC (rev 284537)
+++ php/php-src/branches/PHP_5_2/ext/posix/tests/posix_getcwd.phpt	2009-07-21 14:02:24 UTC (rev 284538)
@@ -1,6 +1,6 @@
 --TEST--
 posix_getcwd(): Basic tests
---SKIP--
+--SKIPIF--
 <?php
 if (!extension_loaded('posix')) die('skip - POSIX extension not loaded');
 if (!function_exists('posix_getcwd')) die('skip posix_getcwd() not found');

Modified: php/php-src/branches/PHP_5_2/ext/posix/tests/posix_getgrnam.phpt
===================================================================
--- php/php-src/branches/PHP_5_2/ext/posix/tests/posix_getgrnam.phpt	2009-07-21 13:57:33 UTC (rev 284537)
+++ php/php-src/branches/PHP_5_2/ext/posix/tests/posix_getgrnam.phpt	2009-07-21 14:02:24 UTC (rev 284538)
@@ -1,6 +1,6 @@
 --TEST--
 posix_getgrnam(): Basic tests
---SKIP--
+--SKIPIF--
 <?php
 if (!extension_loaded('posix')) die('skip - POSIX extension not loaded');
 if (!function_exists('posix_getgrnam')) die('skip posix_getgrnam() not found');

Modified: php/php-src/branches/PHP_5_2/ext/posix/tests/posix_getpwnam.phpt
===================================================================
--- php/php-src/branches/PHP_5_2/ext/posix/tests/posix_getpwnam.phpt	2009-07-21 13:57:33 UTC (rev 284537)
+++ php/php-src/branches/PHP_5_2/ext/posix/tests/posix_getpwnam.phpt	2009-07-21 14:02:24 UTC (rev 284538)
@@ -1,6 +1,6 @@
 --TEST--
 posix_getpwnam(): Basic tests
---SKIP--
+--SKIPIF--
 <?php
 if (!extension_loaded('posix')) die('skip - POSIX extension not loaded');
 if (!function_exists('posix_getpwnam')) die('skip posix_getpwnam() not found');

Modified: php/php-src/branches/PHP_5_2/ext/posix/tests/posix_getrlimit.phpt
===================================================================
--- php/php-src/branches/PHP_5_2/ext/posix/tests/posix_getrlimit.phpt	2009-07-21 13:57:33 UTC (rev 284537)
+++ php/php-src/branches/PHP_5_2/ext/posix/tests/posix_getrlimit.phpt	2009-07-21 14:02:24 UTC (rev 284538)
@@ -1,6 +1,6 @@
 --TEST--
 posix_getrlimit(): Basic tests
---SKIP--
+--SKIPIF--
 <?php
 if (!extension_loaded('posix')) die('skip - POSIX extension not loaded');
 if (!function_exists('posix_getrlimit')) die('skip posix_getrlimit() not found');

Modified: php/php-src/branches/PHP_5_2/ext/posix/tests/posix_initgroups.phpt
===================================================================
--- php/php-src/branches/PHP_5_2/ext/posix/tests/posix_initgroups.phpt	2009-07-21 13:57:33 UTC (rev 284537)
+++ php/php-src/branches/PHP_5_2/ext/posix/tests/posix_initgroups.phpt	2009-07-21 14:02:24 UTC (rev 284538)
@@ -1,6 +1,6 @@
 --TEST--
 posix_initgroups(): Basic tests
---SKIP--
+--SKIPIF--
 <?php
 if (!extension_loaded('posix')) die('skip - POSIX extension not loaded');
 if (!function_exists('posix_initgroups')) die('skip posix_initgroups() not found');

Modified: php/php-src/branches/PHP_5_2/ext/posix/tests/posix_isatty.phpt
===================================================================
--- php/php-src/branches/PHP_5_2/ext/posix/tests/posix_isatty.phpt	2009-07-21 13:57:33 UTC (rev 284537)
+++ php/php-src/branches/PHP_5_2/ext/posix/tests/posix_isatty.phpt	2009-07-21 14:02:24 UTC (rev 284538)
@@ -1,6 +1,6 @@
 --TEST--
 posix_isatty(): Basic tests
---SKIP--
+--SKIPIF--
 <?php
 if (!extension_loaded('posix')) die('skip - POSIX extension not loaded');
 if (!function_exists('posix_isatty')) die('skip posix_isatty() not found');

Modified: php/php-src/branches/PHP_5_2/ext/posix/tests/posix_mknod.phpt
===================================================================
--- php/php-src/branches/PHP_5_2/ext/posix/tests/posix_mknod.phpt	2009-07-21 13:57:33 UTC (rev 284537)
+++ php/php-src/branches/PHP_5_2/ext/posix/tests/posix_mknod.phpt	2009-07-21 14:02:24 UTC (rev 284538)
@@ -1,6 +1,6 @@
 --TEST--
 posix_mknod(): Basic tests
---SKIP--
+--SKIPIF--
 <?php
 if (!extension_loaded('posix')) die('skip - POSIX extension not loaded');
 if (!function_exists('posix_mknod')) die('skip posix_mknod() not found');

Modified: php/php-src/branches/PHP_5_2/ext/standard/tests/array/bug40709.phpt
===================================================================
--- php/php-src/branches/PHP_5_2/ext/standard/tests/array/bug40709.phpt	2009-07-21 13:57:33 UTC (rev 284537)
+++ php/php-src/branches/PHP_5_2/ext/standard/tests/array/bug40709.phpt	2009-07-21 14:02:24 UTC (rev 284538)
@@ -1,6 +1,5 @@
 --TEST--
 Bug #40709 (array_reduce() behaves strange with one item stored arrays)
---SKIPIF--
 --FILE--
 <?php
 function CommaSeperatedList($a, $b) {

Modified: php/php-src/branches/PHP_5_2/ext/standard/tests/strings/addslashes_basic.phpt
===================================================================
--- php/php-src/branches/PHP_5_2/ext/standard/tests/strings/addslashes_basic.phpt	2009-07-21 13:57:33 UTC (rev 284537)
+++ php/php-src/branches/PHP_5_2/ext/standard/tests/strings/addslashes_basic.phpt	2009-07-21 14:02:24 UTC (rev 284538)
@@ -1,6 +1,5 @@
 --TEST--
 Test addslashes() function : basic functionality
---INI--
 --FILE--
 <?php
 /* Prototype  : string addslashes ( string $str )
@@ -36,4 +35,4 @@
 string(17) "Are you \"JOHN\"?"
 string(19) "c:\\php\\addslashes"
 string(12) "hello\0world"
-Done
\ No newline at end of file
+Done

Modified: php/php-src/branches/PHP_5_2/ext/standard/tests/strings/addslashes_error.phpt
===================================================================
--- php/php-src/branches/PHP_5_2/ext/standard/tests/strings/addslashes_error.phpt	2009-07-21 13:57:33 UTC (rev 284537)
+++ php/php-src/branches/PHP_5_2/ext/standard/tests/strings/addslashes_error.phpt	2009-07-21 14:02:24 UTC (rev 284538)
@@ -1,6 +1,5 @@
 --TEST--
 Test addslashes() function : error conditions
---INI--
 --FILE--
 <?php
 /* Prototype  : string addslashes ( string $str )

Modified: php/php-src/branches/PHP_5_2/ext/standard/tests/strings/addslashes_variation1.phpt
===================================================================
--- php/php-src/branches/PHP_5_2/ext/standard/tests/strings/addslashes_variation1.phpt	2009-07-21 13:57:33 UTC (rev 284537)
+++ php/php-src/branches/PHP_5_2/ext/standard/tests/strings/addslashes_variation1.phpt	2009-07-21 14:02:24 UTC (rev 284538)
@@ -1,6 +1,5 @@
 --TEST--
 Test addslashes() function : usage variations  - non-string type argument
---INI--
 --FILE--
 <?php
 /* Prototype  : string addslashes ( string $str )

Modified: php/php-src/branches/PHP_5_2/ext/standard/tests/strings/addslashes_variation2.phpt
===================================================================
--- php/php-src/branches/PHP_5_2/ext/standard/tests/strings/addslashes_variation2.phpt	2009-07-21 13:57:33 UTC (rev 284537)
+++ php/php-src/branches/PHP_5_2/ext/standard/tests/strings/addslashes_variation2.phpt	2009-07-21 14:02:24 UTC (rev 284538)
@@ -1,6 +1,5 @@
 --TEST--
 Test addslashes() function : usage variations - strings with characters to be backslashed
---INI--
 --FILE--
 <?php
 /* Prototype  : string addslashes ( string $str )
@@ -192,4 +191,4 @@

 -- Iteration 34 --
 string(0) ""
-Done
\ No newline at end of file
+Done

Modified: php/php-src/branches/PHP_5_2/ext/standard/tests/strings/addslashes_variation3.phpt
===================================================================
--- php/php-src/branches/PHP_5_2/ext/standard/tests/strings/addslashes_variation3.phpt	2009-07-21 13:57:33 UTC (rev 284537)
+++ php/php-src/branches/PHP_5_2/ext/standard/tests/strings/addslashes_variation3.phpt	2009-07-21 14:02:24 UTC (rev 284538)
@@ -1,6 +1,5 @@
 --TEST--
 Test addslashes() function : usage variations - with magic_quotes_sybase directive ON
---INI--
 --FILE--
 <?php
 /* Prototype  : string addslashes ( string $str )

Modified: php/php-src/branches/PHP_5_2/ext/standard/tests/strings/join_variation6.phpt
===================================================================
--- php/php-src/branches/PHP_5_2/ext/standard/tests/strings/join_variation6.phpt	2009-07-21 13:57:33 UTC (rev 284537)
+++ php/php-src/branches/PHP_5_2/ext/standard/tests/strings/join_variation6.phpt	2009-07-21 14:02:24 UTC (rev 284538)
@@ -1,6 +1,5 @@
 --TEST--
 Test join() function : usage variations - binary safe
---INI--
 --FILE--
 <?php
 /* Prototype  : string join( string $glue, array $pieces )

Modified: php/php-src/branches/PHP_5_2/ext/standard/tests/strings/stripcslashes_variation1.phpt
===================================================================
--- php/php-src/branches/PHP_5_2/ext/standard/tests/strings/stripcslashes_variation1.phpt	2009-07-21 13:57:33 UTC (rev 284537)
+++ php/php-src/branches/PHP_5_2/ext/standard/tests/strings/stripcslashes_variation1.phpt	2009-07-21 14:02:24 UTC (rev 284538)
@@ -1,6 +1,5 @@
 --TEST--
 Test stripcslashes() function : usage variations  - non-string type argument
---INI--
 --FILE--
 <?php
 /* Prototype  : string stripcslashes  ( string $str  )

Modified: php/php-src/branches/PHP_5_2/ext/standard/tests/strings/ucwords_basic.phpt
===================================================================
--- php/php-src/branches/PHP_5_2/ext/standard/tests/strings/ucwords_basic.phpt	2009-07-21 13:57:33 UTC (rev 284537)
+++ php/php-src/branches/PHP_5_2/ext/standard/tests/strings/ucwords_basic.phpt	2009-07-21 14:02:24 UTC (rev 284538)
@@ -1,6 +1,5 @@
 --TEST--
 Test ucwords() function : basic functionality
---INI--
 --FILE--
 <?php
 /* Prototype  : string ucwords ( string $str )

Modified: php/php-src/branches/PHP_5_2/ext/standard/tests/strings/ucwords_error.phpt
===================================================================
--- php/php-src/branches/PHP_5_2/ext/standard/tests/strings/ucwords_error.phpt	2009-07-21 13:57:33 UTC (rev 284537)
+++ php/php-src/branches/PHP_5_2/ext/standard/tests/strings/ucwords_error.phpt	2009-07-21 14:02:24 UTC (rev 284538)
@@ -1,6 +1,5 @@
 --TEST--
 Test ucwords() function : error conditions
---INI--
 --FILE--
 <?php
 /* Prototype  : string ucwords ( string $str )

Modified: php/php-src/branches/PHP_5_2/ext/standard/tests/strings/wordwrap_variation3.phpt
===================================================================
--- php/php-src/branches/PHP_5_2/ext/standard/tests/strings/wordwrap_variation3.phpt	2009-07-21 13:57:33 UTC (rev 284537)
+++ php/php-src/branches/PHP_5_2/ext/standard/tests/strings/wordwrap_variation3.phpt	2009-07-21 14:02:24 UTC (rev 284538)
@@ -1,6 +1,5 @@
 --TEST--
 Test wordwrap() function : usage variations  - unexptected values for break argument
---INI--
 --FILE--
 <?php
 /* Prototype  : string wordwrap ( string $str [, int $width [, string $break [, bool $cut]]] )

Modified: php/php-src/branches/PHP_5_3/Zend/tests/function_exists_error.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/Zend/tests/function_exists_error.phpt	2009-07-21 13:57:33 UTC (rev 284537)
+++ php/php-src/branches/PHP_5_3/Zend/tests/function_exists_error.phpt	2009-07-21 14:02:24 UTC (rev 284538)
@@ -1,6 +1,5 @@
 --TEST--
 Test function_exists() function : error conditions
---INI--
 --FILE--
 <?php
 /*

Modified: php/php-src/branches/PHP_5_3/ext/pcre/tests/preg_split_basic.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/pcre/tests/preg_split_basic.phpt	2009-07-21 13:57:33 UTC (rev 284537)
+++ php/php-src/branches/PHP_5_3/ext/pcre/tests/preg_split_basic.phpt	2009-07-21 14:02:24 UTC (rev 284538)
@@ -1,6 +1,5 @@
 --TEST--
 Test preg_split() function : basic functionality
---INI--
 --FILE--
 <?php
 /*
@@ -73,4 +72,4 @@
   string(1) "("
   [9]=>
   string(1) ")"
-}
\ No newline at end of file
+}

Modified: php/php-src/branches/PHP_5_3/ext/posix/tests/posix_getcwd.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/posix/tests/posix_getcwd.phpt	2009-07-21 13:57:33 UTC (rev 284537)
+++ php/php-src/branches/PHP_5_3/ext/posix/tests/posix_getcwd.phpt	2009-07-21 14:02:24 UTC (rev 284538)
@@ -1,6 +1,6 @@
 --TEST--
 posix_getcwd(): Basic tests
---SKIP--
+--SKIPIF--
 <?php
 if (!extension_loaded('posix')) die('skip - POSIX extension not loaded');
 if (!function_exists('posix_getcwd')) die('skip posix_getcwd() not found');

Modified: php/php-src/branches/PHP_5_3/ext/posix/tests/posix_getgrnam.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/posix/tests/posix_getgrnam.phpt	2009-07-21 13:57:33 UTC (rev 284537)
+++ php/php-src/branches/PHP_5_3/ext/posix/tests/posix_getgrnam.phpt	2009-07-21 14:02:24 UTC (rev 284538)
@@ -1,6 +1,6 @@
 --TEST--
 posix_getgrnam(): Basic tests
---SKIP--
+--SKIPIF--
 <?php
 if (!extension_loaded('posix')) die('skip - POSIX extension not loaded');
 if (!function_exists('posix_getgrnam')) die('skip posix_getgrnam() not found');

Modified: php/php-src/branches/PHP_5_3/ext/posix/tests/posix_getpwnam.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/posix/tests/posix_getpwnam.phpt	2009-07-21 13:57:33 UTC (rev 284537)
+++ php/php-src/branches/PHP_5_3/ext/posix/tests/posix_getpwnam.phpt	2009-07-21 14:02:24 UTC (rev 284538)
@@ -1,6 +1,6 @@
 --TEST--
 posix_getpwnam(): Basic tests
---SKIP--
+--SKIPIF--
 <?php
 if (!extension_loaded('posix')) die('skip - POSIX extension not loaded');
 if (!function_exists('posix_getpwnam')) die('skip posix_getpwnam() not found');

Modified: php/php-src/branches/PHP_5_3/ext/posix/tests/posix_getrlimit.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/posix/tests/posix_getrlimit.phpt	2009-07-21 13:57:33 UTC (rev 284537)
+++ php/php-src/branches/PHP_5_3/ext/posix/tests/posix_getrlimit.phpt	2009-07-21 14:02:24 UTC (rev 284538)
@@ -1,6 +1,6 @@
 --TEST--
 posix_getrlimit(): Basic tests
---SKIP--
+--SKIPIF--
 <?php
 if (!extension_loaded('posix')) die('skip - POSIX extension not loaded');
 if (!function_exists('posix_getrlimit')) die('skip posix_getrlimit() not found');

Modified: php/php-src/branches/PHP_5_3/ext/posix/tests/posix_initgroups.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/posix/tests/posix_initgroups.phpt	2009-07-21 13:57:33 UTC (rev 284537)
+++ php/php-src/branches/PHP_5_3/ext/posix/tests/posix_initgroups.phpt	2009-07-21 14:02:24 UTC (rev 284538)
@@ -1,6 +1,6 @@
 --TEST--
 posix_initgroups(): Basic tests
---SKIP--
+--SKIPIF--
 <?php
 if (!extension_loaded('posix')) die('skip - POSIX extension not loaded');
 if (!function_exists('posix_initgroups')) die('skip posix_initgroups() not found');

Modified: php/php-src/branches/PHP_5_3/ext/posix/tests/posix_isatty.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/posix/tests/posix_isatty.phpt	2009-07-21 13:57:33 UTC (rev 284537)
+++ php/php-src/branches/PHP_5_3/ext/posix/tests/posix_isatty.phpt	2009-07-21 14:02:24 UTC (rev 284538)
@@ -1,6 +1,6 @@
 --TEST--
 posix_isatty(): Basic tests
---SKIP--
+--SKIPIF--
 <?php
 if (!extension_loaded('posix')) die('skip - POSIX extension not loaded');
 if (!function_exists('posix_isatty')) die('skip posix_isatty() not found');

Modified: php/php-src/branches/PHP_5_3/ext/posix/tests/posix_mknod.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/posix/tests/posix_mknod.phpt	2009-07-21 13:57:33 UTC (rev 284537)
+++ php/php-src/branches/PHP_5_3/ext/posix/tests/posix_mknod.phpt	2009-07-21 14:02:24 UTC (rev 284538)
@@ -1,6 +1,6 @@
 --TEST--
 posix_mknod(): Basic tests
---SKIP--
+--SKIPIF--
 <?php
 if (!extension_loaded('posix')) die('skip - POSIX extension not loaded');
 if (!function_exists('posix_mknod')) die('skip posix_mknod() not found');

Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/array/bug40709.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/array/bug40709.phpt	2009-07-21 13:57:33 UTC (rev 284537)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/array/bug40709.phpt	2009-07-21 14:02:24 UTC (rev 284538)
@@ -1,6 +1,5 @@
 --TEST--
 Bug #40709 (array_reduce() behaves strange with one item stored arrays)
---SKIPIF--
 --FILE--
 <?php
 function CommaSeperatedList($a, $b) {

Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/strings/addslashes_basic.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/strings/addslashes_basic.phpt	2009-07-21 13:57:33 UTC (rev 284537)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/strings/addslashes_basic.phpt	2009-07-21 14:02:24 UTC (rev 284538)
@@ -1,6 +1,5 @@
 --TEST--
 Test addslashes() function : basic functionality
---INI--
 --FILE--
 <?php
 /* Prototype  : string addslashes ( string $str )
@@ -36,4 +35,4 @@
 string(17) "Are you \"JOHN\"?"
 string(19) "c:\\php\\addslashes"
 string(12) "hello\0world"
-Done
\ No newline at end of file
+Done

Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/strings/addslashes_error.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/strings/addslashes_error.phpt	2009-07-21 13:57:33 UTC (rev 284537)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/strings/addslashes_error.phpt	2009-07-21 14:02:24 UTC (rev 284538)
@@ -1,6 +1,5 @@
 --TEST--
 Test addslashes() function : error conditions
---INI--
 --FILE--
 <?php
 /* Prototype  : string addslashes ( string $str )

Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/strings/addslashes_variation1.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/strings/addslashes_variation1.phpt	2009-07-21 13:57:33 UTC (rev 284537)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/strings/addslashes_variation1.phpt	2009-07-21 14:02:24 UTC (rev 284538)
@@ -1,6 +1,5 @@
 --TEST--
 Test addslashes() function : usage variations  - non-string type argument
---INI--
 --FILE--
 <?php
 /* Prototype  : string addslashes ( string $str )
@@ -169,4 +168,4 @@
 string(0) ""
 -- Iteration 26 --
 string(0) ""
-===DONE===
\ No newline at end of file
+===DONE===

Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/strings/addslashes_variation2.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/strings/addslashes_variation2.phpt	2009-07-21 13:57:33 UTC (rev 284537)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/strings/addslashes_variation2.phpt	2009-07-21 14:02:24 UTC (rev 284538)
@@ -1,6 +1,5 @@
 --TEST--
 Test addslashes() function : usage variations - strings with characters to be backslashed
---INI--
 --FILE--
 <?php
 /* Prototype  : string addslashes ( string $str )
@@ -192,4 +191,4 @@

 -- Iteration 34 --
 string(0) ""
-Done
\ No newline at end of file
+Done

Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/strings/addslashes_variation3.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/strings/addslashes_variation3.phpt	2009-07-21 13:57:33 UTC (rev 284537)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/strings/addslashes_variation3.phpt	2009-07-21 14:02:24 UTC (rev 284538)
@@ -1,6 +1,5 @@
 --TEST--
 Test addslashes() function : usage variations - with magic_quotes_sybase directive ON
---INI--
 --FILE--
 <?php
 /* Prototype  : string addslashes ( string $str )

Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/strings/join_variation6.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/strings/join_variation6.phpt	2009-07-21 13:57:33 UTC (rev 284537)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/strings/join_variation6.phpt	2009-07-21 14:02:24 UTC (rev 284538)
@@ -1,6 +1,5 @@
 --TEST--
 Test join() function : usage variations - binary safe
---INI--
 --FILE--
 <?php
 /* Prototype  : string join( string $glue, array $pieces )

Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/strings/stripcslashes_variation1.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/strings/stripcslashes_variation1.phpt	2009-07-21 13:57:33 UTC (rev 284537)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/strings/stripcslashes_variation1.phpt	2009-07-21 14:02:24 UTC (rev 284538)
@@ -1,6 +1,5 @@
 --TEST--
 Test stripcslashes() function : usage variations  - non-string type argument
---INI--
 --FILE--
 <?php
 /* Prototype  : string stripcslashes  ( string $str  )

Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/strings/ucwords_basic.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/strings/ucwords_basic.phpt	2009-07-21 13:57:33 UTC (rev 284537)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/strings/ucwords_basic.phpt	2009-07-21 14:02:24 UTC (rev 284538)
@@ -1,6 +1,5 @@
 --TEST--
 Test ucwords() function : basic functionality
---INI--
 --FILE--
 <?php
 /* Prototype  : string ucwords ( string $str )

Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/strings/ucwords_error.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/strings/ucwords_error.phpt	2009-07-21 13:57:33 UTC (rev 284537)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/strings/ucwords_error.phpt	2009-07-21 14:02:24 UTC (rev 284538)
@@ -1,6 +1,5 @@
 --TEST--
 Test ucwords() function : error conditions
---INI--
 --FILE--
 <?php
 /* Prototype  : string ucwords ( string $str )

Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/strings/wordwrap_variation3.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/strings/wordwrap_variation3.phpt	2009-07-21 13:57:33 UTC (rev 284537)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/strings/wordwrap_variation3.phpt	2009-07-21 14:02:24 UTC (rev 284538)
@@ -1,6 +1,5 @@
 --TEST--
 Test wordwrap() function : usage variations  - unexptected values for break argument
---INI--
 --FILE--
 <?php
 /* Prototype  : string wordwrap ( string $str [, int $width [, string $break [, bool $cut]]] )

Modified: php/php-src/branches/PHP_5_3/tests/classes/arrayobject_001.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/tests/classes/arrayobject_001.phpt	2009-07-21 13:57:33 UTC (rev 284537)
+++ php/php-src/branches/PHP_5_3/tests/classes/arrayobject_001.phpt	2009-07-21 14:02:24 UTC (rev 284538)
@@ -1,6 +1,5 @@
 --TEST--
 Ensure that ArrayObject acts like an array
---SKIPIF--
 --FILE--
 <?php


Modified: php/php-src/branches/PHP_5_3/tests/security/open_basedir.inc
===================================================================
--- php/php-src/branches/PHP_5_3/tests/security/open_basedir.inc	2009-07-21 13:57:33 UTC (rev 284537)
+++ php/php-src/branches/PHP_5_3/tests/security/open_basedir.inc	2009-07-21 14:02:24 UTC (rev 284538)
@@ -90,6 +90,7 @@
     global $savedDirectory;
     echo "*** Testing open_basedir configuration [$function] ***\n";
     $directory = getcwd();
+    var_dump($directory);
     $savedDirectory = $directory;
     var_dump(chdir($directory));
     create_directories();

Modified: php/php-src/branches/PHP_5_3/tests/security/open_basedir_copy.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/tests/security/open_basedir_copy.phpt	2009-07-21 13:57:33 UTC (rev 284537)
+++ php/php-src/branches/PHP_5_3/tests/security/open_basedir_copy.phpt	2009-07-21 14:02:24 UTC (rev 284538)
@@ -1,78 +1,11 @@
 --TEST--
 Test open_basedir configuration
 --INI--
-open_basedir=.
+open_basedir={PWD}
 --FILE--
 <?php
-require_once "open_basedir.inc";
-test_open_basedir_before("copy");
+$thisdir = dirname(__FILE__);

-var_dump(copy("ok.txt", "../bad"));
-var_dump(copy("ok.txt", "../bad/bad.txt"));
-var_dump(copy("ok.txt", ".."));
-var_dump(copy("ok.txt", "../"));
-var_dump(copy("ok.txt", "/"));
-var_dump(copy("ok.txt", "../bad/."));
-var_dump(copy("ok.txt", "../bad/./bad.txt"));
-var_dump(copy("ok.txt", "./../."));
+var_dump(touch($thisdir . "afile"));

-var_dump(copy("ok.txt", "copy.txt"));
-var_dump(unlink("copy.txt"));
-test_open_basedir_after("copy");
 ?>
---CLEAN--
-<?php
-require_once "open_basedir.inc";
-delete_directories();
-?>
---EXPECTF--
-*** Testing open_basedir configuration [copy] ***
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-
-Warning: copy(): open_basedir restriction in effect. File(../bad) is not within the allowed path(s): (.) in %s on line %d
-
-Warning: copy(../bad): failed to open stream: %s in %s on line %d
-bool(false)
-
-Warning: copy(): open_basedir restriction in effect. File(../bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d
-
-Warning: copy(../bad/bad.txt): failed to open stream: %s in %s on line %d
-bool(false)
-
-Warning: copy(): open_basedir restriction in effect. File(..) is not within the allowed path(s): (.) in %s on line %d
-
-Warning: copy(..): failed to open stream: %s in %s on line %d
-bool(false)
-
-Warning: copy(): open_basedir restriction in effect. File(../) is not within the allowed path(s): (.) in %s on line %d
-
-Warning: copy(../): failed to open stream: %s in %s on line %d
-bool(false)
-
-Warning: copy(): open_basedir restriction in effect. File(/) is not within the allowed path(s): (.) in %s on line %d
-
-Warning: copy(/): failed to open stream: %s in %s on line %d
-bool(false)
-
-Warning: copy(): open_basedir restriction in effect. File(../bad/.) is not within the allowed path(s): (.) in %s on line %d
-
-Warning: copy(../bad/.): failed to open stream: %s in %s on line %d
-bool(false)
-
-Warning: copy(): open_basedir restriction in effect. File(../bad/./bad.txt) is not within the allowed path(s): (.) in %s on line %d
-
-Warning: copy(../bad/./bad.txt): failed to open stream: %s in %s on line %d
-bool(false)
-
-Warning: copy(): open_basedir restriction in effect. File(./../.) is not within the allowed path(s): (.) in %s on line %d
-
-Warning: copy(./../.): failed to open stream: %s in %s on line %d
-bool(false)
-bool(true)
-bool(true)
-*** Finished testing open_basedir configuration [copy] ***
-

Modified: php/php-src/trunk/Zend/tests/function_exists_error.phpt
===================================================================
--- php/php-src/trunk/Zend/tests/function_exists_error.phpt	2009-07-21 13:57:33 UTC (rev 284537)
+++ php/php-src/trunk/Zend/tests/function_exists_error.phpt	2009-07-21 14:02:24 UTC (rev 284538)
@@ -1,6 +1,5 @@
 --TEST--
 Test function_exists() function : error conditions
---INI--
 --FILE--
 <?php
 /*

Modified: php/php-src/trunk/ext/pcre/tests/preg_split_basic.phpt
===================================================================
--- php/php-src/trunk/ext/pcre/tests/preg_split_basic.phpt	2009-07-21 13:57:33 UTC (rev 284537)
+++ php/php-src/trunk/ext/pcre/tests/preg_split_basic.phpt	2009-07-21 14:02:24 UTC (rev 284538)
@@ -1,6 +1,5 @@
 --TEST--
 Test preg_split() function : basic functionality
---INI--
 --FILE--
 <?php
 /*

Modified: php/php-src/trunk/ext/posix/tests/posix_getcwd.phpt
===================================================================
--- php/php-src/trunk/ext/posix/tests/posix_getcwd.phpt	2009-07-21 13:57:33 UTC (rev 284537)
+++ php/php-src/trunk/ext/posix/tests/posix_getcwd.phpt	2009-07-21 14:02:24 UTC (rev 284538)
@@ -1,6 +1,6 @@
 --TEST--
 posix_getcwd(): Basic tests
---SKIP--
+--SKIPIF--
 <?php
 if (!extension_loaded('posix')) die('skip - POSIX extension not loaded');
 if (!function_exists('posix_getcwd')) die('skip posix_getcwd() not found');

Modified: php/php-src/trunk/ext/posix/tests/posix_getgrnam.phpt
===================================================================
--- php/php-src/trunk/ext/posix/tests/posix_getgrnam.phpt	2009-07-21 13:57:33 UTC (rev 284537)
+++ php/php-src/trunk/ext/posix/tests/posix_getgrnam.phpt	2009-07-21 14:02:24 UTC (rev 284538)
@@ -1,6 +1,6 @@
 --TEST--
 posix_getgrnam(): Basic tests
---SKIP--
+--SKIPIF--
 <?php
 if (!extension_loaded('posix')) die('skip - POSIX extension not loaded');
 if (!function_exists('posix_getgrnam')) die('skip posix_getgrnam() not found');

Modified: php/php-src/trunk/ext/posix/tests/posix_getpwnam.phpt
===================================================================
--- php/php-src/trunk/ext/posix/tests/posix_getpwnam.phpt	2009-07-21 13:57:33 UTC (rev 284537)
+++ php/php-src/trunk/ext/posix/tests/posix_getpwnam.phpt	2009-07-21 14:02:24 UTC (rev 284538)
@@ -1,6 +1,6 @@
 --TEST--
 posix_getpwnam(): Basic tests
---SKIP--
+--SKIPIF--
 <?php
 if (!extension_loaded('posix')) die('skip - POSIX extension not loaded');
 if (!function_exists('posix_getpwnam')) die('skip posix_getpwnam() not found');

Modified: php/php-src/trunk/ext/posix/tests/posix_getrlimit.phpt
===================================================================
--- php/php-src/trunk/ext/posix/tests/posix_getrlimit.phpt	2009-07-21 13:57:33 UTC (rev 284537)
+++ php/php-src/trunk/ext/posix/tests/posix_getrlimit.phpt	2009-07-21 14:02:24 UTC (rev 284538)
@@ -1,6 +1,6 @@
 --TEST--
 posix_getrlimit(): Basic tests
---SKIP--
+--SKIPIF--
 <?php
 if (!extension_loaded('posix')) die('skip - POSIX extension not loaded');
 if (!function_exists('posix_getrlimit')) die('skip posix_getrlimit() not found');

Modified: php/php-src/trunk/ext/posix/tests/posix_initgroups.phpt
===================================================================
--- php/php-src/trunk/ext/posix/tests/posix_initgroups.phpt	2009-07-21 13:57:33 UTC (rev 284537)
+++ php/php-src/trunk/ext/posix/tests/posix_initgroups.phpt	2009-07-21 14:02:24 UTC (rev 284538)
@@ -1,6 +1,6 @@
 --TEST--
 posix_initgroups(): Basic tests
---SKIP--
+--SKIPIF--
 <?php
 if (!extension_loaded('posix')) die('skip - POSIX extension not loaded');
 if (!function_exists('posix_initgroups')) die('skip posix_initgroups() not found');

Modified: php/php-src/trunk/ext/posix/tests/posix_isatty.phpt
===================================================================
--- php/php-src/trunk/ext/posix/tests/posix_isatty.phpt	2009-07-21 13:57:33 UTC (rev 284537)
+++ php/php-src/trunk/ext/posix/tests/posix_isatty.phpt	2009-07-21 14:02:24 UTC (rev 284538)
@@ -1,6 +1,6 @@
 --TEST--
 posix_isatty(): Basic tests
---SKIP--
+--SKIPIF--
 <?php
 if (!extension_loaded('posix')) die('skip - POSIX extension not loaded');
 if (!function_exists('posix_isatty')) die('skip posix_isatty() not found');

Modified: php/php-src/trunk/ext/posix/tests/posix_mknod.phpt
===================================================================
--- php/php-src/trunk/ext/posix/tests/posix_mknod.phpt	2009-07-21 13:57:33 UTC (rev 284537)
+++ php/php-src/trunk/ext/posix/tests/posix_mknod.phpt	2009-07-21 14:02:24 UTC (rev 284538)
@@ -1,6 +1,6 @@
 --TEST--
 posix_mknod(): Basic tests
---SKIP--
+--SKIPIF--
 <?php
 if (!extension_loaded('posix')) die('skip - POSIX extension not loaded');
 if (!function_exists('posix_mknod')) die('skip posix_mknod() not found');

Modified: php/php-src/trunk/ext/standard/tests/array/bug40709.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/array/bug40709.phpt	2009-07-21 13:57:33 UTC (rev 284537)
+++ php/php-src/trunk/ext/standard/tests/array/bug40709.phpt	2009-07-21 14:02:24 UTC (rev 284538)
@@ -1,6 +1,5 @@
 --TEST--
 Bug #40709 (array_reduce() behaves strange with one item stored arrays)
---SKIPIF--
 --FILE--
 <?php
 function CommaSeperatedList($a, $b) {

Modified: php/php-src/trunk/ext/standard/tests/strings/addslashes_basic.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/strings/addslashes_basic.phpt	2009-07-21 13:57:33 UTC (rev 284537)
+++ php/php-src/trunk/ext/standard/tests/strings/addslashes_basic.phpt	2009-07-21 14:02:24 UTC (rev 284538)
@@ -1,6 +1,5 @@
 --TEST--
 Test addslashes() function : basic functionality
---INI--
 --FILE--
 <?php
 /* Prototype  : string addslashes ( string $str )
@@ -36,4 +35,4 @@
 unicode(17) "Are you \"JOHN\"?"
 unicode(19) "c:\\php\\addslashes"
 unicode(12) "hello\0world"
-Done
\ No newline at end of file
+Done

Modified: php/php-src/trunk/ext/standard/tests/strings/addslashes_error.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/strings/addslashes_error.phpt	2009-07-21 13:57:33 UTC (rev 284537)
+++ php/php-src/trunk/ext/standard/tests/strings/addslashes_error.phpt	2009-07-21 14:02:24 UTC (rev 284538)
@@ -1,6 +1,5 @@
 --TEST--
 Test addslashes() function : error conditions
---INI--
 --FILE--
 <?php
 /* Prototype  : string addslashes ( string $str )

Modified: php/php-src/trunk/ext/standard/tests/strings/addslashes_variation1.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/strings/addslashes_variation1.phpt	2009-07-21 13:57:33 UTC (rev 284537)
+++ php/php-src/trunk/ext/standard/tests/strings/addslashes_variation1.phpt	2009-07-21 14:02:24 UTC (rev 284538)
@@ -1,6 +1,5 @@
 --TEST--
 Test addslashes() function : usage variations  - non-string type argument
---INI--
 --FILE--
 <?php
 /* Prototype  : string addslashes ( string $str )

Modified: php/php-src/trunk/ext/standard/tests/strings/addslashes_variation2.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/strings/addslashes_variation2.phpt	2009-07-21 13:57:33 UTC (rev 284537)
+++ php/php-src/trunk/ext/standard/tests/strings/addslashes_variation2.phpt	2009-07-21 14:02:24 UTC (rev 284538)
@@ -1,6 +1,5 @@
 --TEST--
 Test addslashes() function : usage variations - strings with characters to be backslashed
---INI--
 --FILE--
 <?php
 /* Prototype  : string addslashes ( string $str )
@@ -192,4 +191,4 @@

 -- Iteration 34 --
 unicode(0) ""
-Done
\ No newline at end of file
+Done

Modified: php/php-src/trunk/ext/standard/tests/strings/join_variation6.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/strings/join_variation6.phpt	2009-07-21 13:57:33 UTC (rev 284537)
+++ php/php-src/trunk/ext/standard/tests/strings/join_variation6.phpt	2009-07-21 14:02:24 UTC (rev 284538)
@@ -1,6 +1,5 @@
 --TEST--
 Test join() function : usage variations - binary safe
---INI--
 --FILE--
 <?php
 /* Prototype  : string join( string $glue, array $pieces )

Modified: php/php-src/trunk/ext/standard/tests/strings/stripcslashes_variation1.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/strings/stripcslashes_variation1.phpt	2009-07-21 13:57:33 UTC (rev 284537)
+++ php/php-src/trunk/ext/standard/tests/strings/stripcslashes_variation1.phpt	2009-07-21 14:02:24 UTC (rev 284538)
@@ -1,6 +1,5 @@
 --TEST--
 Test stripcslashes() function : usage variations  - non-string type argument
---INI--
 --FILE--
 <?php
 /* Prototype  : string stripcslashes  ( string $str  )
@@ -175,4 +174,4 @@
 string(0) ""
 -- Iteration 26 --
 string(0) ""
-===DONE===
\ No newline at end of file
+===DONE===

Modified: php/php-src/trunk/ext/standard/tests/strings/wordwrap_variation3.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/strings/wordwrap_variation3.phpt	2009-07-21 13:57:33 UTC (rev 284537)
+++ php/php-src/trunk/ext/standard/tests/strings/wordwrap_variation3.phpt	2009-07-21 14:02:24 UTC (rev 284538)
@@ -1,6 +1,5 @@
 --TEST--
 Test wordwrap() function : usage variations  - unexptected values for break argument
---INI--
 --FILE--
 <?php
 /* Prototype  : string wordwrap ( string $str [, int $width [, string $break [, bool $cut]]] )

Modified: php/php-src/trunk/tests/classes/arrayobject_001.phpt
===================================================================
--- php/php-src/trunk/tests/classes/arrayobject_001.phpt	2009-07-21 13:57:33 UTC (rev 284537)
+++ php/php-src/trunk/tests/classes/arrayobject_001.phpt	2009-07-21 14:02:24 UTC (rev 284538)
@@ -1,6 +1,5 @@
 --TEST--
 Ensure that ArrayObject acts like an array
---SKIPIF--
 --FILE--
 <?php