diff options
| author | Stanislav Malyshev <stas@php.net> | 2011-05-27 19:27:05 +0000 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2011-05-27 19:27:05 +0000 |
| commit | 845d0805a85ff62e022e66233cb136f6b3e69904 (patch) | |
| tree | 1235e076ee6b2a08e9b42cbb2153fedd4a56d167 | |
| parent | c16bfe403f4d6ee2aa43ff1b669f440f72446f34 (diff) | |
| download | php-git-845d0805a85ff62e022e66233cb136f6b3e69904.tar.gz | |
MFH: Fixes for broken tests.
| -rw-r--r-- | ext/mcrypt/tests/bug46010.phpt | 2 | ||||
| -rw-r--r-- | tests/security/open_basedir_linkinfo.phpt | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ext/mcrypt/tests/bug46010.phpt b/ext/mcrypt/tests/bug46010.phpt index bacfb59759..ddb691e362 100644 --- 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 5c930dddce..ecbb00f74d 100644 --- 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] *** |