Skip to content

Commit df85e15

Browse files
committed
do not skip lookup on unloadable exts
1 parent 597b6f0 commit df85e15

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

run-tests.php

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1083,17 +1083,17 @@ function get_binary(string $php, string $sapi, string $sapi_path): ?string
10831083

10841084
function find_files(string $dir, bool $is_ext_dir = false, bool $ignore = false): void
10851085
{
1086-
global $test_files, $exts_to_test, $ignored_by_ext, $exts_skipped;
1086+
global $test_files, $ignored_by_ext;
10871087

10881088
$o = opendir($dir) or error("cannot open directory: $dir");
10891089

10901090
while (($name = readdir($o)) !== false) {
1091-
if (is_dir("{$dir}/{$name}") && !in_array($name, ['.', '..', '.svn'])) {
1092-
$skip_ext = ($is_ext_dir && !in_array(strtolower($name), $exts_to_test));
1093-
if ($skip_ext) {
1094-
$exts_skipped[] = $name;
1095-
}
1096-
find_files("{$dir}/{$name}", false, $ignore || $skip_ext);
1091+
if (in_array($name, ['.', '..', '.svn', '.git'])) {
1092+
continue;
1093+
}
1094+
1095+
if (is_dir("{$dir}/{$name}")) {
1096+
find_files("{$dir}/{$name}", false, $ignore);
10971097
}
10981098

10991099
// Cleanup any left-over tmp files from last run.
@@ -3737,10 +3737,10 @@ public function getExtensions(string $php): array
37373737

37383738
$extDir = `$php -d display_errors=0 -r "echo ini_get('extension_dir');"`;
37393739
$extensions = explode(",", `$php -d display_errors=0 -r "echo implode(',', get_loaded_extensions());"`);
3740-
$extensions = array_map('strtolower', $extensions);
3741-
if (in_array('zend opcache', $extensions)) {
3740+
if (in_array('Zend OPcache', $extensions)) {
37423741
$extensions[] = 'opcache';
37433742
}
3743+
$extensions = array_map('strtolower', $extensions);
37443744

37453745
$result = [$extDir, $extensions];
37463746
$this->extensions[$php] = $result;

0 commit comments

Comments
 (0)