- killed off UEXPECT

42 files changed, 0 insertions, 380 deletions

diff --git a/tests/security/open_basedir_chdir.phpt b/tests/security/open_basedir_chdir.phpt
index 32ed4eb1ec..9b3debf189 100644
--- a/tests/security/open_basedir_chdir.phpt
+++ b/tests/security/open_basedir_chdir.phpt
@@ -48,4 +48,3 @@ bool(false)
 Warning: chdir(): open_basedir restriction in effect. File(./../.) is not within the allowed path(s): (.) in %s on line %d
 bool(false)
 *** Finished testing open_basedir configuration [chdir] ***
-
diff --git a/tests/security/open_basedir_chmod.phpt b/tests/security/open_basedir_chmod.phpt
index 02fdce5a1b..78a44f88a2 100644
--- a/tests/security/open_basedir_chmod.phpt
+++ b/tests/security/open_basedir_chmod.phpt
@@ -68,4 +68,3 @@ bool(true)
 bool(true)
 bool(true)
 *** Finished testing open_basedir configuration [chmod] ***
-
diff --git a/tests/security/open_basedir_copy.phpt b/tests/security/open_basedir_copy.phpt
index 8f0f7a91fd..7a1bb4aed9 100644
--- a/tests/security/open_basedir_copy.phpt
+++ b/tests/security/open_basedir_copy.phpt
@@ -76,4 +76,3 @@ bool(false)
 bool(true)
 bool(true)
 *** Finished testing open_basedir configuration [copy] ***
-
diff --git a/tests/security/open_basedir_copy_variation1.phpt b/tests/security/open_basedir_copy_variation1.phpt
index de532e12cb..d49f368ccb 100644
--- a/tests/security/open_basedir_copy_variation1.phpt
+++ b/tests/security/open_basedir_copy_variation1.phpt
@@ -32,4 +32,3 @@ bool(false)
 Warning: unlink(copy.txt): No such file or directory in %s on line %d
 bool(false)
 *** Finished testing open_basedir configuration [copy] ***
-
diff --git a/tests/security/open_basedir_dir.phpt b/tests/security/open_basedir_dir.phpt
index 5e3cc7aa16..026c5fdece 100644
--- a/tests/security/open_basedir_dir.phpt
+++ b/tests/security/open_basedir_dir.phpt
@@ -67,72 +67,6 @@ Warning: dir(): open_basedir restriction in effect. File(%s/test/bad/../bad/bad.
 Warning: dir(%s/test/bad/../bad/bad.txt): failed to open dir: Operation not permitted in %s on line %d
 bool(false)
 object(Directory)#%d (2) {
-  ["path"]=>
-  string(%d) "%s/test/ok/"
-  ["handle"]=>
-  resource(%d) of type (stream)
-}
-object(Directory)#%d (2) {
-  ["path"]=>
-  string(%d) "%s/test/ok"
-  ["handle"]=>
-  resource(%d) of type (stream)
-}
-object(Directory)#%d (2) {
-  ["path"]=>
-  string(%d) "%s/test/ok/../ok"
-  ["handle"]=>
-  resource(%d) of type (stream)
-}
-*** Finished testing open_basedir configuration [dir] ***
---UEXPECTF--
-*** Testing open_basedir configuration [dir] ***
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-
-Warning: dir(): open_basedir restriction in effect. File(../bad) is not within the allowed path(s): (.) in %s on line %d
-
-Warning: dir(../bad): failed to open dir: Operation not permitted in %s on line %d
-bool(false)
-
-Warning: dir(): open_basedir restriction in effect. File(../bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d
-
-Warning: dir(../bad/bad.txt): failed to open dir: Operation not permitted in %s on line %d
-bool(false)
-
-Warning: dir(): open_basedir restriction in effect. File(..) is not within the allowed path(s): (.) in %s on line %d
-
-Warning: dir(..): failed to open dir: Operation not permitted in %s on line %d
-bool(false)
-
-Warning: dir(): open_basedir restriction in effect. File(../) is not within the allowed path(s): (.) in %s on line %d
-
-Warning: dir(../): failed to open dir: Operation not permitted in %s on line %d
-bool(false)
-
-Warning: dir(): open_basedir restriction in effect. File(/) is not within the allowed path(s): (.) in %s on line %d
-
-Warning: dir(/): failed to open dir: Operation not permitted in %s on line %d
-bool(false)
-
-Warning: dir(): open_basedir restriction in effect. File(../bad/.) is not within the allowed path(s): (.) in %s on line %d
-
-Warning: dir(../bad/.): failed to open dir: Operation not permitted in %s on line %d
-bool(false)
-
-Warning: dir(): open_basedir restriction in effect. File(%s/test/bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d
-
-Warning: dir(%s/test/bad/bad.txt): failed to open dir: Operation not permitted in %s on line %d
-bool(false)
-
-Warning: dir(): open_basedir restriction in effect. File(%s/test/bad/../bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d
-
-Warning: dir(%s/test/bad/../bad/bad.txt): failed to open dir: Operation not permitted in %s on line %d
-bool(false)
-object(Directory)#%d (2) {
   [u"path"]=>
   unicode(%d) "%s/test/ok/"
   [u"handle"]=>
@@ -151,4 +85,3 @@ object(Directory)#%d (2) {
   resource(%d) of type (stream)
 }
 *** Finished testing open_basedir configuration [dir] ***
-
diff --git a/tests/security/open_basedir_error_log.phpt b/tests/security/open_basedir_error_log.phpt
index bb899c8adb..97253a1053 100644
--- a/tests/security/open_basedir_error_log.phpt
+++ b/tests/security/open_basedir_error_log.phpt
@@ -37,26 +37,6 @@ bool(false)
 
 Warning: ini_set(): open_basedir restriction in effect. File(%s/bad.txt) is not within the allowed path(s): (.) in %s on line %d
 bool(false)
-string(0) ""
-string(%d) "%s/test/ok/ok.txt"
-*** Finished testing open_basedir configuration [error_log] ***
---UEXPECTF--
-*** Testing open_basedir configuration [error_log] ***
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-
-Warning: ini_set(): open_basedir restriction in effect. File(%s/test/bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d
-bool(false)
-
-Warning: ini_set(): open_basedir restriction in effect. File(%s/test/bad.txt) is not within the allowed path(s): (.) in %s on line %d
-bool(false)
-
-Warning: ini_set(): open_basedir restriction in effect. File(%s/bad.txt) is not within the allowed path(s): (.) in %s on line %d
-bool(false)
 unicode(0) ""
 unicode(%d) "%s/test/ok/ok.txt"
 *** Finished testing open_basedir configuration [error_log] ***
-
diff --git a/tests/security/open_basedir_error_log_variation.phpt b/tests/security/open_basedir_error_log_variation.phpt
index c0295f6506..08a6525d0c 100644
--- a/tests/security/open_basedir_error_log_variation.phpt
+++ b/tests/security/open_basedir_error_log_variation.phpt
@@ -45,4 +45,3 @@ Warning: error_log(%s/bad.txt): failed to open stream: Operation not permitted i
 bool(false)
 bool(true)
 *** Finished testing open_basedir configuration [error_log] ***
-
diff --git a/tests/security/open_basedir_file.phpt b/tests/security/open_basedir_file.phpt
index fbc841e3fe..ef41388966 100644
--- a/tests/security/open_basedir_file.phpt
+++ b/tests/security/open_basedir_file.phpt
@@ -85,4 +85,3 @@ array(1) {
   string(12) "Hello World!"
 }
 *** Finished testing open_basedir configuration [file] ***
-
diff --git a/tests/security/open_basedir_file_exists.phpt b/tests/security/open_basedir_file_exists.phpt
index c249fc1165..2c90fd550b 100644
--- a/tests/security/open_basedir_file_exists.phpt
+++ b/tests/security/open_basedir_file_exists.phpt
@@ -52,4 +52,3 @@ bool(true)
 bool(true)
 bool(true)
 *** Finished testing open_basedir configuration [file_exists] ***
-
diff --git a/tests/security/open_basedir_file_put_contents.phpt b/tests/security/open_basedir_file_put_contents.phpt
index d4bd417b59..3be241b9ef 100644
--- a/tests/security/open_basedir_file_put_contents.phpt
+++ b/tests/security/open_basedir_file_put_contents.phpt
@@ -54,4 +54,3 @@ Warning: file_put_contents(): open_basedir restriction in effect. File%s/test/ba
 Warning: file_put_contents%s/test/bad/bad.txt): failed to open stream: Operation not permitted in %s on line %d
 bool(false)
 *** Finished testing open_basedir configuration [file_put_contents] ***
-
diff --git a/tests/security/open_basedir_fileatime.phpt b/tests/security/open_basedir_fileatime.phpt
index 02cc94f83f..4cb7aefc39 100644
--- a/tests/security/open_basedir_fileatime.phpt
+++ b/tests/security/open_basedir_fileatime.phpt
@@ -52,4 +52,3 @@ int(%d)
 int(%d)
 int(%d)
 *** Finished testing open_basedir configuration [fileatime] ***
-
diff --git a/tests/security/open_basedir_filectime.phpt b/tests/security/open_basedir_filectime.phpt
index 542c8423ed..08c7ecd5f2 100644
--- a/tests/security/open_basedir_filectime.phpt
+++ b/tests/security/open_basedir_filectime.phpt
@@ -52,4 +52,3 @@ int(%d)
 int(%d)
 int(%d)
 *** Finished testing open_basedir configuration [filectime] ***
-
diff --git a/tests/security/open_basedir_filegroup.phpt b/tests/security/open_basedir_filegroup.phpt
index 5f6279aa8f..f85f81bb7b 100644
--- a/tests/security/open_basedir_filegroup.phpt
+++ b/tests/security/open_basedir_filegroup.phpt
@@ -52,4 +52,3 @@ int(%d)
 int(%d)
 int(%d)
 *** Finished testing open_basedir configuration [filegroup] ***
-
diff --git a/tests/security/open_basedir_fileinode.phpt b/tests/security/open_basedir_fileinode.phpt
index 070c2c806c..08e378bb6f 100644
--- a/tests/security/open_basedir_fileinode.phpt
+++ b/tests/security/open_basedir_fileinode.phpt
@@ -52,4 +52,3 @@ int(%d)
 int(%d)
 int(%d)
 *** Finished testing open_basedir configuration [fileinode] ***
-
diff --git a/tests/security/open_basedir_filemtime.phpt b/tests/security/open_basedir_filemtime.phpt
index 7213ddb5b9..36e2de9ce8 100644
--- a/tests/security/open_basedir_filemtime.phpt
+++ b/tests/security/open_basedir_filemtime.phpt
@@ -52,4 +52,3 @@ int(%d)
 int(%d)
 int(%d)
 *** Finished testing open_basedir configuration [filemtime] ***
-
diff --git a/tests/security/open_basedir_fileowner.phpt b/tests/security/open_basedir_fileowner.phpt
index b363b7e0e8..7ce6cb30f8 100644
--- a/tests/security/open_basedir_fileowner.phpt
+++ b/tests/security/open_basedir_fileowner.phpt
@@ -52,4 +52,3 @@ int(%d)
 int(%d)
 int(%d)
 *** Finished testing open_basedir configuration [fileowner] ***
-
diff --git a/tests/security/open_basedir_fileperms.phpt b/tests/security/open_basedir_fileperms.phpt
index a1e6511b08..944f1cd5ed 100644
--- a/tests/security/open_basedir_fileperms.phpt
+++ b/tests/security/open_basedir_fileperms.phpt
@@ -52,4 +52,3 @@ int(%d)
 int(%d)
 int(%d)
 *** Finished testing open_basedir configuration [fileperms] ***
-
diff --git a/tests/security/open_basedir_filesize.phpt b/tests/security/open_basedir_filesize.phpt
index a335dfd17c..e682c2fac4 100644
--- a/tests/security/open_basedir_filesize.phpt
+++ b/tests/security/open_basedir_filesize.phpt
@@ -52,4 +52,3 @@ int(%d)
 int(%d)
 int(%d)
 *** Finished testing open_basedir configuration [filesize] ***
-
diff --git a/tests/security/open_basedir_filetype.phpt b/tests/security/open_basedir_filetype.phpt
index fa104a3679..749aca0742 100644
--- a/tests/security/open_basedir_filetype.phpt
+++ b/tests/security/open_basedir_filetype.phpt
@@ -46,50 +46,9 @@ bool(false)
 
 Warning: filetype(): open_basedir restriction in effect. File(./../.) is not within the allowed path(s): (.) in %s on line %d
 bool(false)
-string(3) "dir"
-string(4) "file"
-string(4) "file"
-string(4) "file"
-string(4) "file"
-*** Finished testing open_basedir configuration [filetype] ***
---UEXPECTF--
-*** Testing open_basedir configuration [filetype] ***
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-
-Warning: filetype(): open_basedir restriction in effect. File(../bad) is not within the allowed path(s): (.) in %s on line %d
-bool(false)
-
-Warning: filetype(): open_basedir restriction in effect. File(../bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d
-bool(false)
-
-Warning: filetype(): open_basedir restriction in effect. File(..) is not within the allowed path(s): (.) in %s on line %d
-bool(false)
-
-Warning: filetype(): open_basedir restriction in effect. File(../) is not within the allowed path(s): (.) in %s on line %d
-bool(false)
-
-Warning: filetype(): open_basedir restriction in effect. File(/) is not within the allowed path(s): (.) in %s on line %d
-bool(false)
-
-Warning: filetype(): open_basedir restriction in effect. File(../bad/.) is not within the allowed path(s): (.) in %s on line %d
-bool(false)
-
-Warning: filetype(): open_basedir restriction in effect. File(%s/test/bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d
-bool(false)
-
-Warning: filetype(): open_basedir restriction in effect. File(%s/test/bad/../bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d
-bool(false)
-
-Warning: filetype(): open_basedir restriction in effect. File(./../.) is not within the allowed path(s): (.) in %s on line %d
-bool(false)
 unicode(3) "dir"
 unicode(4) "file"
 unicode(4) "file"
 unicode(4) "file"
 unicode(4) "file"
 *** Finished testing open_basedir configuration [filetype] ***
-
diff --git a/tests/security/open_basedir_fopen.phpt b/tests/security/open_basedir_fopen.phpt
index c6c9a253f2..0f3bc065a9 100644
--- a/tests/security/open_basedir_fopen.phpt
+++ b/tests/security/open_basedir_fopen.phpt
@@ -83,4 +83,3 @@ resource(%d) of type (stream)
 resource(%d) of type (stream)
 resource(%d) of type (stream)
 *** Finished testing open_basedir configuration [fopen] ***
-
diff --git a/tests/security/open_basedir_glob-win32.phpt b/tests/security/open_basedir_glob-win32.phpt
index bdc8d93fbd..d1f8df551e 100644
--- a/tests/security/open_basedir_glob-win32.phpt
+++ b/tests/security/open_basedir_glob-win32.phpt
@@ -37,44 +37,6 @@ bool(false)
 bool(false)
 array(1) {
   [0]=>
-  string(5) "../ok"
-}
-array(1) {
-  [0]=>
-  string(6) "ok.txt"
-}
-array(1) {
-  [0]=>
-  string(12) "../ok/ok.txt"
-}
-array(1) {
-  [0]=>
-  string(%d) "%s/test/ok/ok.txt"
-}
-array(1) {
-  [0]=>
-  string(%d) "%s/test/ok/../ok/ok.txt"
-}
-*** Finished testing open_basedir configuration [glob] ***
---UEXPECTF--
-*** Testing open_basedir configuration [glob] ***
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(false)
-bool(false)
-bool(false)
-array(0) {
-}
-bool(false)
-bool(false)
-bool(false)
-bool(false)
-bool(false)
-array(1) {
-  [0]=>
   unicode(5) "../ok"
 }
 array(1) {
@@ -94,4 +56,3 @@ array(1) {
   unicode(%d) "%s/test/ok/../ok/ok.txt"
 }
 *** Finished testing open_basedir configuration [glob] ***
-
diff --git a/tests/security/open_basedir_glob.phpt b/tests/security/open_basedir_glob.phpt
index 14bac1474e..20834d8a2c 100644
--- a/tests/security/open_basedir_glob.phpt
+++ b/tests/security/open_basedir_glob.phpt
@@ -36,43 +36,6 @@ bool(false)
 bool(false)
 array(1) {
   [0]=>
-  string(5) "../ok"
-}
-array(1) {
-  [0]=>
-  string(6) "ok.txt"
-}
-array(1) {
-  [0]=>
-  string(12) "../ok/ok.txt"
-}
-array(1) {
-  [0]=>
-  string(%d) "%s/test/ok/ok.txt"
-}
-array(1) {
-  [0]=>
-  string(%d) "%s/test/ok/../ok/ok.txt"
-}
-*** Finished testing open_basedir configuration [glob] ***
---UEXPECTF--
-*** Testing open_basedir configuration [glob] ***
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(false)
-bool(false)
-bool(false)
-bool(false)
-bool(false)
-bool(false)
-bool(false)
-bool(false)
-bool(false)
-array(1) {
-  [0]=>
   unicode(5) "../ok"
 }
 array(1) {
@@ -92,4 +55,3 @@ array(1) {
   unicode(%d) "%s/test/ok/../ok/ok.txt"
 }
 *** Finished testing open_basedir configuration [glob] ***
-
diff --git a/tests/security/open_basedir_is_dir.phpt b/tests/security/open_basedir_is_dir.phpt
index e4ad620d74..5c8967a9f4 100644
--- a/tests/security/open_basedir_is_dir.phpt
+++ b/tests/security/open_basedir_is_dir.phpt
@@ -52,4 +52,3 @@ bool(false)
 bool(false)
 bool(false)
 *** Finished testing open_basedir configuration [is_dir] ***
-
diff --git a/tests/security/open_basedir_is_file.phpt b/tests/security/open_basedir_is_file.phpt
index 51ef0a2d1f..a3303599b5 100644
--- a/tests/security/open_basedir_is_file.phpt
+++ b/tests/security/open_basedir_is_file.phpt
@@ -52,4 +52,3 @@ bool(true)
 bool(true)
 bool(true)
 *** Finished testing open_basedir configuration [is_file] ***
-
diff --git a/tests/security/open_basedir_is_link.phpt b/tests/security/open_basedir_is_link.phpt
index 5d12148d85..61485029f4 100644
--- a/tests/security/open_basedir_is_link.phpt
+++ b/tests/security/open_basedir_is_link.phpt
@@ -52,4 +52,3 @@ bool(false)
 bool(false)
 bool(false)
 *** Finished testing open_basedir configuration [is_link] ***
-
diff --git a/tests/security/open_basedir_is_readable.phpt b/tests/security/open_basedir_is_readable.phpt
index 951a19ac76..9a269b5c0b 100644
--- a/tests/security/open_basedir_is_readable.phpt
+++ b/tests/security/open_basedir_is_readable.phpt
@@ -52,4 +52,3 @@ bool(true)
 bool(true)
 bool(true)
 *** Finished testing open_basedir configuration [is_readable] ***
-
diff --git a/tests/security/open_basedir_is_writable.phpt b/tests/security/open_basedir_is_writable.phpt
index 25ce1c63a4..d2b70614cd 100644
--- a/tests/security/open_basedir_is_writable.phpt
+++ b/tests/security/open_basedir_is_writable.phpt
@@ -52,4 +52,3 @@ bool(true)
 bool(true)
 bool(true)
 *** Finished testing open_basedir configuration [is_writable] ***
-
diff --git a/tests/security/open_basedir_link.phpt b/tests/security/open_basedir_link.phpt
index a54c22f4b6..695824d3b1 100644
--- a/tests/security/open_basedir_link.phpt
+++ b/tests/security/open_basedir_link.phpt
@@ -75,4 +75,3 @@ bool(false)
 bool(true)
 bool(true)
 *** Finished testing open_basedir configuration [link] ***
-
diff --git a/tests/security/open_basedir_linkinfo.phpt b/tests/security/open_basedir_linkinfo.phpt
index ab12a5149d..ed6df19ffa 100644
--- a/tests/security/open_basedir_linkinfo.phpt
+++ b/tests/security/open_basedir_linkinfo.phpt
@@ -61,4 +61,3 @@ int(%d)
 Warning: unlink(): open_basedir restriction in effect. File(%s/test/ok/symlink.txt) is not within the allowed path(s): (.) in %s on line %d
 bool(false)
 *** Finished testing open_basedir configuration [linkinfo] ***
-
diff --git a/tests/security/open_basedir_lstat.phpt b/tests/security/open_basedir_lstat.phpt
index 35e5a22019..8cd037dbd3 100644
--- a/tests/security/open_basedir_lstat.phpt
+++ b/tests/security/open_basedir_lstat.phpt
@@ -52,4 +52,3 @@ bool(true)
 bool(true)
 bool(true)
 *** Finished testing open_basedir configuration [lstat] ***
-
diff --git a/tests/security/open_basedir_opendir.phpt b/tests/security/open_basedir_opendir.phpt
index 077a5116b4..b580f15dd2 100644
--- a/tests/security/open_basedir_opendir.phpt
+++ b/tests/security/open_basedir_opendir.phpt
@@ -70,4 +70,3 @@ resource(%d) of type (stream)
 resource(%d) of type (stream)
 resource(%d) of type (stream)
 *** Finished testing open_basedir configuration [opendir] ***
-
diff --git a/tests/security/open_basedir_parse_ini_file.phpt b/tests/security/open_basedir_parse_ini_file.phpt
index ac740f073b..cba16cea9c 100644
--- a/tests/security/open_basedir_parse_ini_file.phpt
+++ b/tests/security/open_basedir_parse_ini_file.phpt
@@ -79,4 +79,3 @@ Warning: parse_ini_file(%s\test): failed to open stream: Operation not permitted
 array(0) {
 }
 *** Finished testing open_basedir configuration [parse_ini_file] ***
-
diff --git a/tests/security/open_basedir_readlink.phpt b/tests/security/open_basedir_readlink.phpt
index cbba4307e5..5133410290 100644
--- a/tests/security/open_basedir_readlink.phpt
+++ b/tests/security/open_basedir_readlink.phpt
@@ -73,4 +73,3 @@ bool(false)
 Warning: unlink(): open_basedir restriction in effect. File(%s/test/ok/symlink.txt) is not within the allowed path(s): (.) in %s on line %d
 bool(false)
 *** Finished testing open_basedir configuration [readlink] ***
-
diff --git a/tests/security/open_basedir_realpath.phpt b/tests/security/open_basedir_realpath.phpt
index a107be8ffc..bec1c12b04 100644
--- a/tests/security/open_basedir_realpath.phpt
+++ b/tests/security/open_basedir_realpath.phpt
@@ -25,28 +25,6 @@ bool(true)
 bool(true)
 bool(true)
 bool(true)
-string(%d) "%s\test\bad"
-string(%d) "%s\test\bad\bad.txt"
-string(%d) "%s\test"
-string(%d) "%s\test"
-string(%d) "%s"
-string(%d) "%s\test\bad"
-string(%d) "%s\test\bad\bad.txt"
-string(%d) "%s\test\bad\bad.txt"
-string(%d) "%s\test"
-string(%d) "%s\test\ok"
-string(%d) "%s\test\ok\ok.txt"
-string(%d) "%s\test\ok\ok.txt"
-string(%d) "%s\test\ok\ok.txt"
-string(%d) "%s\test\ok\ok.txt"
-*** Finished testing open_basedir configuration [realpath] ***
---UEXPECTF--
-*** Testing open_basedir configuration [realpath] ***
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
 unicode(%d) "%s\test\bad"
 unicode(%d) "%s\test\bad\bad.txt"
 unicode(%d) "%s\test"
@@ -62,4 +40,3 @@ unicode(%d) "%s\test\ok\ok.txt"
 unicode(%d) "%s\test\ok\ok.txt"
 unicode(%d) "%s\test\ok\ok.txt"
 *** Finished testing open_basedir configuration [realpath] ***
-
diff --git a/tests/security/open_basedir_rename.phpt b/tests/security/open_basedir_rename.phpt
index 428e7a070a..e512e58d46 100644
--- a/tests/security/open_basedir_rename.phpt
+++ b/tests/security/open_basedir_rename.phpt
@@ -44,4 +44,3 @@ bool(false)
 Warning: rename(): open_basedir restriction in effect. File(%s/test/bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d
 bool(false)
 *** Finished testing open_basedir configuration [rename] ***
-
diff --git a/tests/security/open_basedir_rmdir.phpt b/tests/security/open_basedir_rmdir.phpt
index b4d61f8b76..8cc4f818c8 100644
--- a/tests/security/open_basedir_rmdir.phpt
+++ b/tests/security/open_basedir_rmdir.phpt
@@ -44,4 +44,3 @@ bool(false)
 Warning: rmdir(): open_basedir restriction in effect. File(%s/test/bad) is not within the allowed path(s): (.) in %s on line %d
 bool(false)
 *** Finished testing open_basedir configuration [rmdir] ***
-
diff --git a/tests/security/open_basedir_scandir.phpt b/tests/security/open_basedir_scandir.phpt
index 1c5072046d..28e9741cb8 100644
--- a/tests/security/open_basedir_scandir.phpt
+++ b/tests/security/open_basedir_scandir.phpt
@@ -84,94 +84,6 @@ Warning: scandir(): (errno 1): Operation not permitted in %s on line %d
 bool(false)
 array(3) {
   [0]=>
-  string(1) "."
-  [1]=>
-  string(2) ".."
-  [2]=>
-  string(6) "ok.txt"
-}
-array(3) {
-  [0]=>
-  string(1) "."
-  [1]=>
-  string(2) ".."
-  [2]=>
-  string(6) "ok.txt"
-}
-array(3) {
-  [0]=>
-  string(1) "."
-  [1]=>
-  string(2) ".."
-  [2]=>
-  string(6) "ok.txt"
-}
-*** Finished testing open_basedir configuration [scandir] ***
---UEXPECTF--
-*** Testing open_basedir configuration [scandir] ***
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-
-Warning: scandir(): open_basedir restriction in effect. File(../bad) is not within the allowed path(s): (.) in %s on line %d
-
-Warning: scandir(../bad): failed to open dir: Operation not permitted in %s on line %d
-
-Warning: scandir(): (errno 1): Operation not permitted in %s on line %d
-bool(false)
-
-Warning: scandir(): open_basedir restriction in effect. File(../bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d
-
-Warning: scandir(../bad/bad.txt): failed to open dir: Operation not permitted in %s on line %d
-
-Warning: scandir(): (errno 1): Operation not permitted in %s on line %d
-bool(false)
-
-Warning: scandir(): open_basedir restriction in effect. File(..) is not within the allowed path(s): (.) in %s on line %d
-
-Warning: scandir(..): failed to open dir: Operation not permitted in %s on line %d
-
-Warning: scandir(): (errno 1): Operation not permitted in %s on line %d
-bool(false)
-
-Warning: scandir(): open_basedir restriction in effect. File(../) is not within the allowed path(s): (.) in %s on line 80
-
-Warning: scandir(../): failed to open dir: Operation not permitted in %s on line %d
-
-Warning: scandir(): (errno 1): Operation not permitted in %s on line %d
-bool(false)
-
-Warning: scandir(): open_basedir restriction in effect. File(/) is not within the allowed path(s): (.) in %s on line %d
-
-Warning: scandir(/): failed to open dir: Operation not permitted in %s on line %d
-
-Warning: scandir(): (errno 1): Operation not permitted in %s on line %d
-bool(false)
-
-Warning: scandir(): open_basedir restriction in effect. File(../bad/.) is not within the allowed path(s): (.) in %s on line %d
-
-Warning: scandir(../bad/.): failed to open dir: Operation not permitted in %s on line %d
-
-Warning: scandir(): (errno 1): Operation not permitted in %s on line %d
-bool(false)
-
-Warning: scandir(): open_basedir restriction in effect. File(%s/test/bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d
-
-Warning: scandir(%s/test/bad/bad.txt): failed to open dir: Operation not permitted in %s on line %d
-
-Warning: scandir(): (errno 1): Operation not permitted in %s on line %d
-bool(false)
-
-Warning: scandir(): open_basedir restriction in effect. File(%s/test/bad/../bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d
-
-Warning: scandir(%s/test/bad/../bad/bad.txt): failed to open dir: Operation not permitted in %s on line %d
-
-Warning: scandir(): (errno 1): Operation not permitted in %s on line %d
-bool(false)
-array(3) {
-  [0]=>
   unicode(1) "."
   [1]=>
   unicode(2) ".."
@@ -195,4 +107,3 @@ array(3) {
   unicode(6) "ok.txt"
 }
 *** Finished testing open_basedir configuration [scandir] ***
-
diff --git a/tests/security/open_basedir_stat.phpt b/tests/security/open_basedir_stat.phpt
index b80b854d6c..2ad67d67d5 100644
--- a/tests/security/open_basedir_stat.phpt
+++ b/tests/security/open_basedir_stat.phpt
@@ -52,4 +52,3 @@ bool(true)
 bool(true)
 bool(true)
 *** Finished testing open_basedir configuration [stat] ***
-
diff --git a/tests/security/open_basedir_symlink.phpt b/tests/security/open_basedir_symlink.phpt
index 3b3f1d571f..ab87e87b04 100644
--- a/tests/security/open_basedir_symlink.phpt
+++ b/tests/security/open_basedir_symlink.phpt
@@ -75,4 +75,3 @@ bool(false)
 bool(true)
 bool(true)
 *** Finished testing open_basedir configuration [symlink] ***
-
diff --git a/tests/security/open_basedir_tempnam.phpt b/tests/security/open_basedir_tempnam.phpt
index 4a6db0ae7d..691cae03ad 100644
--- a/tests/security/open_basedir_tempnam.phpt
+++ b/tests/security/open_basedir_tempnam.phpt
@@ -51,35 +51,6 @@ bool(false)
 
 Warning: tempnam(): open_basedir restriction in effect. File(./../.) is not within the allowed path(s): (.) in %s on line %d
 bool(false)
-string(%d) "%s"
-bool(true)
-*** Finished testing open_basedir configuration [tempnam] ***
---UEXPECTF--
-*** Testing open_basedir configuration [tempnam] ***
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-
-Warning: tempnam(): open_basedir restriction in effect. File(../bad) is not within the allowed path(s): (.) in %s on line %d
-bool(false)
-
-Warning: tempnam(): open_basedir restriction in effect. File(..) is not within the allowed path(s): (.) in %s on line %d
-bool(false)
-
-Warning: tempnam(): open_basedir restriction in effect. File(../) is not within the allowed path(s): (.) in %s on line %d
-bool(false)
-
-Warning: tempnam(): open_basedir restriction in effect. File(/) is not within the allowed path(s): (.) in %s on line %d
-bool(false)
-
-Warning: tempnam(): open_basedir restriction in effect. File(../bad/.) is not within the allowed path(s): (.) in %s on line %d
-bool(false)
-
-Warning: tempnam(): open_basedir restriction in effect. File(./../.) is not within the allowed path(s): (.) in %s on line %d
-bool(false)
 unicode(%d) "%s"
 bool(true)
 *** Finished testing open_basedir configuration [tempnam] ***
-
diff --git a/tests/security/open_basedir_touch.phpt b/tests/security/open_basedir_touch.phpt
index b0a5aee612..03c7b9e05f 100644
--- a/tests/security/open_basedir_touch.phpt
+++ b/tests/security/open_basedir_touch.phpt
@@ -67,4 +67,3 @@ bool(true)
 bool(true)
 bool(true)
 *** Finished testing open_basedir configuration [touch] ***
-
diff --git a/tests/security/open_basedir_unlink.phpt b/tests/security/open_basedir_unlink.phpt
index 75b0f3f4a9..e2d025c18a 100644
--- a/tests/security/open_basedir_unlink.phpt
+++ b/tests/security/open_basedir_unlink.phpt
@@ -44,4 +44,3 @@ bool(false)
 Warning: unlink(): open_basedir restriction in effect. File(%s/test/bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d
 bool(false)
 *** Finished testing open_basedir configuration [unlink] ***
-