From: Stanislav Malyshev <stas@php.net>
Date: Fri, 27 May 2011 19:27:05 +0000 (+0000)
Subject: MFH: Fixes for broken tests.
X-Git-Tag: php-5.4.0alpha1~125
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=845d0805a85ff62e022e66233cb136f6b3e69904;p=php

MFH: Fixes for broken tests.
---

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] ***