summaryrefslogtreecommitdiff
path: root/run-tests.php
diff options
context:
space:
mode:
authorNikita Popov <nikita.ppv@gmail.com>2019-06-13 12:35:29 +0200
committerNikita Popov <nikita.ppv@gmail.com>2019-06-13 12:35:29 +0200
commitf8a68fd9350ac97d33d1773453c4e9d47a97b33f (patch)
treeccdf75c8b1adc0843932cc588daac017f73dc816 /run-tests.php
parentfeb92adc5c5a1526f34894b1db676f1191c1a238 (diff)
downloadphp-git-f8a68fd9350ac97d33d1773453c4e9d47a97b33f.tar.gz
Add test for bug #78106
Also add PHP_TEST_EXTRA_ARGS environment variable, which allows to pass on -c, -d etc flags provided by run-tests.php. Otherwise we won't get the built-in server to run with opcache.
Diffstat (limited to 'run-tests.php')
-rwxr-xr-xrun-tests.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/run-tests.php b/run-tests.php
index 1e07509506..d5638aad99 100755
--- a/run-tests.php
+++ b/run-tests.php
@@ -820,7 +820,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) . "'";
}
}
@@ -1611,6 +1611,8 @@ TEST $file
settings2params($ini_settings);
+ $env['TEST_PHP_EXTRA_ARGS'] = $pass_options . ' ' . $ini_settings;
+
// Check if test should be skipped.
$info = '';
$warn = false;