diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2019-05-08 19:22:21 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2019-05-08 19:22:21 +0200 |
| commit | 236522529c0f2d43473e45d5a2801dc6f0d2f420 (patch) | |
| tree | 653db076ed0720caf38fc6522e93de19a3eba33f /run-tests.php | |
| parent | e2ef4e9e2fa8cdb749ce4c2afdd3499765ffb721 (diff) | |
| parent | 3d0a0f801b6eb0ec7d4fdee119b339d2dab9771f (diff) | |
| download | php-git-236522529c0f2d43473e45d5a2801dc6f0d2f420.tar.gz | |
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Add {TMP} placeholder for PHPT INI sections
Diffstat (limited to 'run-tests.php')
| -rw-r--r-- | run-tests.php | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/run-tests.php b/run-tests.php index c47770ca06..6491507fc3 100644 --- a/run-tests.php +++ b/run-tests.php @@ -1593,9 +1593,8 @@ TEST $file // Any special ini settings // these may overwrite the test defaults... if (array_key_exists('INI', $section_text)) { - if (strpos($section_text['INI'], '{PWD}') !== false) { - $section_text['INI'] = str_replace('{PWD}', dirname($file), $section_text['INI']); - } + $section_text['INI'] = str_replace('{PWD}', dirname($file), $section_text['INI']); + $section_text['INI'] = str_replace('{TMP}', sys_get_temp_dir(), $section_text['INI']); settings2array(preg_split( "/[\n\r]+/", $section_text['INI']), $ini_settings); } |