stas                                     Fri, 27 May 2011 19:27:05 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=311509

Log:
MFH: Fixes for broken tests.

Changed paths:
    U   php/php-src/branches/PHP_5_4/ext/mcrypt/tests/bug46010.phpt
    U   php/php-src/branches/PHP_5_4/tests/security/open_basedir_linkinfo.phpt

Modified: php/php-src/branches/PHP_5_4/ext/mcrypt/tests/bug46010.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/mcrypt/tests/bug46010.phpt 2011-05-27 
19:24:09 UTC (rev 311508)
+++ php/php-src/branches/PHP_5_4/ext/mcrypt/tests/bug46010.phpt 2011-05-27 
19:27:05 UTC (rev 311509)
@@ -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


Modified: php/php-src/branches/PHP_5_4/tests/security/open_basedir_linkinfo.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/tests/security/open_basedir_linkinfo.phpt      
2011-05-27 19:24:09 UTC (rev 311508)
+++ php/php-src/branches/PHP_5_4/tests/security/open_basedir_linkinfo.phpt      
2011-05-27 19:27:05 UTC (rev 311509)
@@ -57,8 +57,6 @@
 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] ***


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to