MFH: Fixes for broken tests.

diff --git a/ext/mcrypt/tests/bug46010.phpt b/ext/mcrypt/tests/bug46010.phpt
index bacfb597591879427501f88a0ee58acf5fe5fe06..ddb691e362d5f003514048b417f8bc14f6e3721a 100644 (file)
--- a/ext/mcrypt/tests/bug46010.phpt
+++ b/ext/mcrypt/tests/bug46010.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #46010 (warnings incorrectly generated for iv in ecb mode)
+--SKIPIF--
+<?php if (!extension_loaded("mcrypt")) print "skip"; ?>
 --FILE--
 <?php
 

diff --git a/tests/security/open_basedir_linkinfo.phpt b/tests/security/open_basedir_linkinfo.phpt
index 5c930dddcef93bddcbebe228dd49fa69209bd246..ecbb00f74d43bc5e2a45d0716350abf164dd73d6 100644 (file)
--- a/tests/security/open_basedir_linkinfo.phpt
+++ b/tests/security/open_basedir_linkinfo.phpt
@@ -57,8 +57,6 @@ int(%d)
 Warning: symlink(): 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)
 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)
+bool(true)
 *** Finished testing open_basedir configuration [linkinfo] ***