Skip to content

Commit 370a0a4

Browse files
committed
Stricter check for extension names; avoid exclusion list
1 parent 4ba2c99 commit 370a0a4

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

run-tests.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -866,7 +866,7 @@ function write_information(array $user_tests, $phpdbg): void
866866
$exts = get_loaded_extensions();
867867
$ext_dir = ini_get('extension_dir');
868868
foreach (scandir($ext_dir) as $file) {
869-
if (preg_match('/^(?:php_)?([_a-zA-Z0-9]+)\.(?:so|dll)$/', $file, $matches)) {
869+
if (preg_match('/^(?:php_)([_a-zA-Z0-9]+)\.(?:so|dll)$/', $file, $matches)) {
870870
if (!extension_loaded($matches[1])) {
871871
$exts[] = $matches[1];
872872
}
@@ -2029,7 +2029,7 @@ function run_test(string $php, $file, array $env): string
20292029
if ($test->hasSection('EXTENSIONS')) {
20302030
$extensions = preg_split("/[\n\r]+/", trim($test->getSection('EXTENSIONS')));
20312031
if (in_array("*", $extensions, true)) {
2032-
$extensions = array_diff($exts_to_test, ["php8apache2_4", "php8phpdbg", "php8ts_debug"]);
2032+
$extensions = $exts_to_test;
20332033
}
20342034
}
20352035
if (is_array($IN_REDIRECT) && $IN_REDIRECT['EXTENSIONS'] != []) {

0 commit comments

Comments
 (0)