Remove empty sections. Fix bad use of --SKIP--

diff --git a/Zend/tests/function_exists_error.phpt b/Zend/tests/function_exists_error.phpt
index c95dc0718f63fa692a8a073c7c4f03a8b32e4334..cbc3908f12b305b59a3e12dbad5dc859549f0241 100644 (file)
--- a/Zend/tests/function_exists_error.phpt
+++ b/Zend/tests/function_exists_error.phpt
@@ -1,6 +1,5 @@
 --TEST--
 Test function_exists() function : error conditions 
---INI--
 --FILE--
 <?php
 /* 

diff --git a/ext/pcre/tests/preg_split_basic.phpt b/ext/pcre/tests/preg_split_basic.phpt
index 324270ac3a0b569a0815215344426e688f12074c..e94a94f62e78fd50ffc55dd87a969055dc9e052e 100644 (file)
--- a/ext/pcre/tests/preg_split_basic.phpt
+++ b/ext/pcre/tests/preg_split_basic.phpt
@@ -1,6 +1,5 @@
 --TEST--
 Test preg_split() function : basic functionality 
---INI--
 --FILE--
 <?php
 /*
@@ -73,4 +72,4 @@ array(10) {
   string(1) "("
   [9]=>
   string(1) ")"
-}
\ No newline at end of file
+}

diff --git a/ext/posix/tests/posix_getcwd.phpt b/ext/posix/tests/posix_getcwd.phpt
index fc5a6d43e51d24319b89083293a89c64923c5bb1..75c8d575baf01dbbe14d04310fa493ab3507ccd5 100644 (file)
--- a/ext/posix/tests/posix_getcwd.phpt
+++ b/ext/posix/tests/posix_getcwd.phpt
@@ -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');

diff --git a/ext/posix/tests/posix_getgrnam.phpt b/ext/posix/tests/posix_getgrnam.phpt
index 9d24f085e0a25ba8a30a5d999971a1d512f08b11..854db4ac1614d90670e416b5957306e631a9e542 100644 (file)
--- a/ext/posix/tests/posix_getgrnam.phpt
+++ b/ext/posix/tests/posix_getgrnam.phpt
@@ -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');

diff --git a/ext/posix/tests/posix_getpwnam.phpt b/ext/posix/tests/posix_getpwnam.phpt
index 4b89622977c8f50a8bdb3b6480387bd88abb836a..b5de1e4ce233d11fb80b7f3cc72ab474d49c37b7 100644 (file)
--- a/ext/posix/tests/posix_getpwnam.phpt
+++ b/ext/posix/tests/posix_getpwnam.phpt
@@ -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');

diff --git a/ext/posix/tests/posix_getrlimit.phpt b/ext/posix/tests/posix_getrlimit.phpt
index 55bd8aff8eee6f713d915ad8b9bf2f282a9bd1cb..61da64a93856b32ecc1f2e8f6206909c2ce03fea 100644 (file)
--- a/ext/posix/tests/posix_getrlimit.phpt
+++ b/ext/posix/tests/posix_getrlimit.phpt
@@ -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');

diff --git a/ext/posix/tests/posix_initgroups.phpt b/ext/posix/tests/posix_initgroups.phpt
index 6ffb202f3c92fd98bf4601fb4be4e698620295e4..60121e845d76b3c46aa9005a5a44f0e0490abaaf 100644 (file)
--- a/ext/posix/tests/posix_initgroups.phpt
+++ b/ext/posix/tests/posix_initgroups.phpt
@@ -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');

diff --git a/ext/posix/tests/posix_isatty.phpt b/ext/posix/tests/posix_isatty.phpt
index 74309c299df07c2fd2390b1c114dfbf2ff874b7a..0b40dd1d438c840ea4b0d1d709ec5a29862f6aa9 100644 (file)
--- a/ext/posix/tests/posix_isatty.phpt
+++ b/ext/posix/tests/posix_isatty.phpt
@@ -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');

diff --git a/ext/posix/tests/posix_mknod.phpt b/ext/posix/tests/posix_mknod.phpt
index 1063abe5d333353823b1304466a3f266de8c2667..4044fb98d960c084843ab461cc1147106bcbff6d 100644 (file)
--- a/ext/posix/tests/posix_mknod.phpt
+++ b/ext/posix/tests/posix_mknod.phpt
@@ -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');

diff --git a/ext/standard/tests/array/bug40709.phpt b/ext/standard/tests/array/bug40709.phpt
index 6ab6bbd4101b033c68c97a5ce3516bdd08a2f0d6..eb0c712000d5981db2a133bb2f305568bdd80f3c 100644 (file)
--- a/ext/standard/tests/array/bug40709.phpt
+++ b/ext/standard/tests/array/bug40709.phpt
@@ -1,6 +1,5 @@
 --TEST--
 Bug #40709 (array_reduce() behaves strange with one item stored arrays)
---SKIPIF--
 --FILE--
 <?php
 function CommaSeperatedList($a, $b) {

diff --git a/ext/standard/tests/strings/addslashes_basic.phpt b/ext/standard/tests/strings/addslashes_basic.phpt
index 6ed12106703c93121e381f5381779bfa2745365b..0912d34e483d784056bcc0c26c7deb4a2b685caa 100644 (file)
--- a/ext/standard/tests/strings/addslashes_basic.phpt
+++ b/ext/standard/tests/strings/addslashes_basic.phpt
@@ -1,6 +1,5 @@
 --TEST--
 Test addslashes() function : basic functionality 
---INI--
 --FILE--
 <?php
 /* Prototype  : string addslashes ( string $str )
@@ -36,4 +35,4 @@ string(16) "How\'s everybody"
 string(17) "Are you \"JOHN\"?"
 string(19) "c:\\php\\addslashes"
 string(12) "hello\0world"
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/strings/addslashes_error.phpt b/ext/standard/tests/strings/addslashes_error.phpt
index 4ebd8878565791e76928aef46753c5fd56320d7d..e920dfd1c49b61a8c498125a919605f83b738baf 100644 (file)
--- a/ext/standard/tests/strings/addslashes_error.phpt
+++ b/ext/standard/tests/strings/addslashes_error.phpt
@@ -1,6 +1,5 @@
 --TEST--
 Test addslashes() function : error conditions 
---INI--
 --FILE--
 <?php
 /* Prototype  : string addslashes ( string $str )

diff --git a/ext/standard/tests/strings/addslashes_variation1.phpt b/ext/standard/tests/strings/addslashes_variation1.phpt
index 93bb69dd134de159b8b766aad28401604d14f936..cc245ae04b3a9dc49cf01ce1196855641884500c 100644 (file)
--- a/ext/standard/tests/strings/addslashes_variation1.phpt
+++ b/ext/standard/tests/strings/addslashes_variation1.phpt
@@ -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 @@ NULL
 string(0) ""
 -- Iteration 26 --
 string(0) ""
-===DONE===
\ No newline at end of file
+===DONE===

diff --git a/ext/standard/tests/strings/addslashes_variation2.phpt b/ext/standard/tests/strings/addslashes_variation2.phpt
index 285d9058afdc9ad32417fdbaf5bf92676ce8d33e..49009e81085c5e32ac9eb349070e544db33ea224 100644 (file)
--- a/ext/standard/tests/strings/addslashes_variation2.phpt
+++ b/ext/standard/tests/strings/addslashes_variation2.phpt
@@ -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 @@ This is line 2 of \"heredoc\" string"
 
 -- Iteration 34 --
 string(0) ""
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/strings/addslashes_variation3.phpt b/ext/standard/tests/strings/addslashes_variation3.phpt
index 302ca7e18b543bf40defeb3cd61a2adedc45fbbf..8f46ebe9a4b14a6d6a984b27e6196751c75677e0 100644 (file)
--- a/ext/standard/tests/strings/addslashes_variation3.phpt
+++ b/ext/standard/tests/strings/addslashes_variation3.phpt
@@ -1,6 +1,5 @@
 --TEST--
 Test addslashes() function : usage variations - with magic_quotes_sybase directive ON
---INI--
 --FILE--
 <?php
 /* Prototype  : string addslashes ( string $str )

diff --git a/ext/standard/tests/strings/join_variation6.phpt b/ext/standard/tests/strings/join_variation6.phpt
index e8d098115538190d9a391fa5ec148e94c1319adc..a627d77bf4b5e4d5a374c6006a8b2297481a03a3 100644 (file)
Binary files a/ext/standard/tests/strings/join_variation6.phpt and b/ext/standard/tests/strings/join_variation6.phpt differ

diff --git a/ext/standard/tests/strings/stripcslashes_variation1.phpt b/ext/standard/tests/strings/stripcslashes_variation1.phpt
index a46276f1385274e22efcc485b911649e3ea76dfa..32c8963df7f1d0df2caac11fad60e9fc866f98bb 100644 (file)
--- a/ext/standard/tests/strings/stripcslashes_variation1.phpt
+++ b/ext/standard/tests/strings/stripcslashes_variation1.phpt
@@ -1,6 +1,5 @@
 --TEST--
 Test stripcslashes() function : usage variations  - non-string type argument 
---INI--
 --FILE--
 <?php
 /* Prototype  : string stripcslashes  ( string $str  )

diff --git a/ext/standard/tests/strings/ucwords_basic.phpt b/ext/standard/tests/strings/ucwords_basic.phpt
index f34d8e912072e5a93ad756a8ac71efd26c74a97a..bba0d9bc4afa2c3ed2cff15c514471ce7e00e3db 100644 (file)
--- a/ext/standard/tests/strings/ucwords_basic.phpt
+++ b/ext/standard/tests/strings/ucwords_basic.phpt
@@ -1,6 +1,5 @@
 --TEST--
 Test ucwords() function : basic functionality 
---INI--
 --FILE--
 <?php
 /* Prototype  : string ucwords ( string $str )

diff --git a/ext/standard/tests/strings/ucwords_error.phpt b/ext/standard/tests/strings/ucwords_error.phpt
index 69a388ce847aad4d89732abc56d42837184696a6..d79e569cc7bbe34457488147ab4cac0048aa329d 100644 (file)
--- a/ext/standard/tests/strings/ucwords_error.phpt
+++ b/ext/standard/tests/strings/ucwords_error.phpt
@@ -1,6 +1,5 @@
 --TEST--
 Test ucwords() function : error conditions 
---INI--
 --FILE--
 <?php
 /* Prototype  : string ucwords ( string $str )

diff --git a/ext/standard/tests/strings/wordwrap_variation3.phpt b/ext/standard/tests/strings/wordwrap_variation3.phpt
index 2f83add7bde7a2c99b8dd6462da27efa952bd492..7d0c8167072202e4f39264eff1afae00e6b876e4 100644 (file)
--- a/ext/standard/tests/strings/wordwrap_variation3.phpt
+++ b/ext/standard/tests/strings/wordwrap_variation3.phpt
@@ -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]]] )

diff --git a/tests/classes/arrayobject_001.phpt b/tests/classes/arrayobject_001.phpt
index 51208f8c64639e2bdff12087b64adc4d5ff9ae13..b75f8c7ab3cc72fa8e1470204b298ab8ab3b9692 100644 (file)
--- a/tests/classes/arrayobject_001.phpt
+++ b/tests/classes/arrayobject_001.phpt
@@ -1,6 +1,5 @@
 --TEST--
 Ensure that ArrayObject acts like an array
---SKIPIF--
 --FILE--
 <?php
 

diff --git a/tests/security/open_basedir.inc b/tests/security/open_basedir.inc
index c5de8ca11268e631f0e3fed3728db9830971aa7f..95ea8d2044083c4a212e18579adb88949cdca103 100644 (file)
--- a/tests/security/open_basedir.inc
+++ b/tests/security/open_basedir.inc
@@ -90,6 +90,7 @@ function test_open_basedir_before($function, $change = TRUE) {
     global $savedDirectory;
     echo "*** Testing open_basedir configuration [$function] ***\n";
     $directory = getcwd();
+    var_dump($directory);
     $savedDirectory = $directory;
     var_dump(chdir($directory));
     create_directories();

diff --git a/tests/security/open_basedir_copy.phpt b/tests/security/open_basedir_copy.phpt
index 7cb902add0a14f472bf3ed2de5cc39daf80bf2b2..8490b074a2ed34c6144bc9736ea470fbf01673c3 100644 (file)
--- a/tests/security/open_basedir_copy.phpt
+++ b/tests/security/open_basedir_copy.phpt
@@ -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] ***
-