diff options
| author | Ferenc Kovacs <tyrael@php.net> | 2014-01-21 02:28:32 +0100 |
|---|---|---|
| committer | Ferenc Kovacs <tyrael@php.net> | 2014-01-21 02:28:32 +0100 |
| commit | c4142f6f58925a9db376e34754d370721a871391 (patch) | |
| tree | 781dde0fc5ee09c228b899931bf9db7123f590e4 | |
| parent | a3837d88aa18d8a575c47b17bde673555fd9a983 (diff) | |
| parent | 2bd68bf03940769cbd59e5876935147291fd4017 (diff) | |
| download | php-git-c4142f6f58925a9db376e34754d370721a871391.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fix these tests so they properly clean up after themselves.
| -rw-r--r-- | tests/security/open_basedir_linkinfo.phpt | 1 | ||||
| -rw-r--r-- | tests/security/open_basedir_readlink.phpt | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/tests/security/open_basedir_linkinfo.phpt b/tests/security/open_basedir_linkinfo.phpt index f8be45305e..55cf2c2f4b 100644 --- a/tests/security/open_basedir_linkinfo.phpt +++ b/tests/security/open_basedir_linkinfo.phpt @@ -41,6 +41,7 @@ test_open_basedir_after("linkinfo"); ?> --CLEAN-- <?php +chdir(__DIR__); require_once "open_basedir.inc"; delete_directories(); ?> diff --git a/tests/security/open_basedir_readlink.phpt b/tests/security/open_basedir_readlink.phpt index b102ee9d9c..33720bbf1b 100644 --- a/tests/security/open_basedir_readlink.phpt +++ b/tests/security/open_basedir_readlink.phpt @@ -37,6 +37,7 @@ test_open_basedir_after("readlink"); ?> --CLEAN-- <?php +chdir(__DIR__); require_once "open_basedir.inc"; delete_directories(); ?> |