diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-06-13 12:38:57 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-06-13 12:38:57 +0200 |
| commit | ee137a703372e92583e9dfb6e2f3a9d66ebde556 (patch) | |
| tree | 4c65e7f38f9ad9254b2e95d64753739a29c0583f /run-tests.php | |
| parent | 5d3e3a62a2c5a7ebe7f25ec453fb97d1429093a1 (diff) | |
| parent | f8a68fd9350ac97d33d1773453c4e9d47a97b33f (diff) | |
| download | php-git-ee137a703372e92583e9dfb6e2f3a9d66ebde556.tar.gz | |
Merge branch 'PHP-7.2' into PHP-7.3
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 6491507fc3..7b20b0bde3 100755 --- a/run-tests.php +++ b/run-tests.php @@ -818,7 +818,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) . "'"; } } @@ -1600,6 +1600,8 @@ TEST $file settings2params($ini_settings); + $env['TEST_PHP_EXTRA_ARGS'] = $pass_options . ' ' . $ini_settings; + // Check if test should be skipped. $info = ''; $warn = false; |