diff options
| -rwxr-xr-x | run-tests.php | 12 | ||||
| -rw-r--r-- | tests/run-test/bug75042-2.phpt | 15 | ||||
| -rw-r--r-- | tests/run-test/bug75042-3.phpt | 8 | ||||
| -rw-r--r-- | tests/run-test/bug75042.phpt | 17 |
4 files changed, 48 insertions, 4 deletions
diff --git a/run-tests.php b/run-tests.php index 1991b56a08..4f0c793260 100755 --- a/run-tests.php +++ b/run-tests.php @@ -1504,15 +1504,19 @@ TEST $file // Additional required extensions if (array_key_exists('EXTENSIONS', $section_text)) { - $ext_dir=`$php -r 'echo ini_get("extension_dir");'`; + $ext_params = array(); + settings2array($ini_overwrites, $ext_params); + settings2params($ext_params); + $ext_dir=`$php $pass_options $ext_params -d display_errors=0 -r "echo ini_get('extension_dir');"`; $extensions = preg_split("/[\n\r]+/", trim($section_text['EXTENSIONS'])); - $loaded = explode(",", `$php -n -r 'echo join(",", get_loaded_extensions());'`); + $loaded = explode(",", `$php $pass_options $ext_params -d display_errors=0 -r "echo implode(',', get_loaded_extensions());"`); + $ext_prefix = substr(PHP_OS, 0, 3) === "WIN" ? "php_" : ""; foreach ($extensions as $req_ext) { if (!in_array($req_ext, $loaded)) { if ($req_ext == 'opcache') { - $ini_settings['zend_extension'][] = $ext_dir . DIRECTORY_SEPARATOR . $req_ext . '.' . PHP_SHLIB_SUFFIX; + $ini_settings['zend_extension'][] = $ext_dir . DIRECTORY_SEPARATOR . $ext_prefix . $req_ext . '.' . PHP_SHLIB_SUFFIX; } else { - $ini_settings['extension'][] = $ext_dir . DIRECTORY_SEPARATOR . $req_ext . '.' . PHP_SHLIB_SUFFIX; + $ini_settings['extension'][] = $ext_dir . DIRECTORY_SEPARATOR . $ext_prefix . $req_ext . '.' . PHP_SHLIB_SUFFIX; } } } diff --git a/tests/run-test/bug75042-2.phpt b/tests/run-test/bug75042-2.phpt new file mode 100644 index 0000000000..25f6d08e61 --- /dev/null +++ b/tests/run-test/bug75042-2.phpt @@ -0,0 +1,15 @@ +--TEST-- +phpt EXTENSIONS directive with static module +--SKIPIF-- +<?php +$php = getenv('TEST_PHP_EXECUTABLE'); +if (false === stripos(`$php -n -m`, 'spl')) { + die('skip spl is NOT built static'); +} +--EXTENSIONS-- +SPL +--FILE-- +<?php +var_dump(extension_loaded('spl')); +--EXPECT-- +bool(true) diff --git a/tests/run-test/bug75042-3.phpt b/tests/run-test/bug75042-3.phpt new file mode 100644 index 0000000000..76ec2b5ff0 --- /dev/null +++ b/tests/run-test/bug75042-3.phpt @@ -0,0 +1,8 @@ +--TEST-- +phpt EXTENSIONS directive with nonexistent shared module +--EXTENSIONS-- +nonexistentsharedmodule +--FILE-- +<?php +--EXPECTF-- +PHP Warning: PHP Startup: Unable to load dynamic library '%snonexistentsharedmodule.%s' %A
\ No newline at end of file diff --git a/tests/run-test/bug75042.phpt b/tests/run-test/bug75042.phpt new file mode 100644 index 0000000000..001e8f3e7d --- /dev/null +++ b/tests/run-test/bug75042.phpt @@ -0,0 +1,17 @@ +--TEST-- +phpt EXTENSIONS directive with shared module +--SKIPIF-- +<?php +$php = getenv('TEST_PHP_EXECUTABLE'); +if (false !== stripos(`$php -n -m`, 'openssl')) { + die('skip openssl is built static'); +} +$ext_module = ini_get('extension_dir') . DIRECTORY_SEPARATOR . (substr(PHP_OS, 0, 3) === "WIN" ? "php_openssl." : "openssl.") . PHP_SHLIB_SUFFIX; +if( !file_exists($ext_module) ) die('skip openssl shared extension not found'); +--EXTENSIONS-- +openssl +--FILE-- +<?php +var_dump(extension_loaded('openssl')); +--EXPECT-- +bool(true) |