diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-06-13 12:40:23 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-06-13 12:41:01 +0200 |
| commit | da275e6214043eb049e22b7062ff58367f5ec5aa (patch) | |
| tree | 3ceec1ec8c580b6c0e4422abd7faf777ed8b4d0d /run-tests.php | |
| parent | cac6b04113f6ab59d4ae22d760f9375627e059fc (diff) | |
| parent | ee137a703372e92583e9dfb6e2f3a9d66ebde556 (diff) | |
| download | php-git-da275e6214043eb049e22b7062ff58367f5ec5aa.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
Diffstat (limited to 'run-tests.php')
| -rwxr-xr-x | run-tests.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/run-tests.php b/run-tests.php index be4eb1d155..50db361634 100755 --- a/run-tests.php +++ b/run-tests.php @@ -672,7 +672,7 @@ HELP; if (substr(PHP_OS, 0, 3) == "WIN") { $pass_options .= " -c " . escapeshellarg($conf_passed); } else { - $pass_options .= " -c '$conf_passed'"; + $pass_options .= " -c '" . realpath($conf_passed) . "'"; } } @@ -2123,6 +2123,8 @@ TEST $file settings2params($ini_settings); + $env['TEST_PHP_EXTRA_ARGS'] = $pass_options . ' ' . $ini_settings; + // Check if test should be skipped. $info = ''; $warn = false; |