com phpruntests: fixing Olivier's out of memory problem: src/rtUtil.php

Commit: a69c8b431745c5c5ea32777d2751a562f1c7093d Author: Zoe Slattery <zoe@php.net> Sun, 21 Jun 2009 20:29:12 +0000 Parents: ff08eea2839447dc2a3508b5f3699dfa2a7cdb4b Branches: master Link: http://git.php.net/?p=phpruntests.git;a=commitdiff;h=a69c8b431745c5c5ea32777d2751a562f1c7093d Log: fixing Olivier's out of memory problem Changed paths: M src/rtUtil.php Diff: diff --git a/src/rtUtil.php b/src/rtUtil.php index 4dcf873..2f6360c 100644 --- a/src/rtUtil.php +++ b/src/rtUtil.php @@ -3,7 +3,7 @@ * rtUtil * * Static utility methods - * + * * @category Testing * @package RUNTESTS * @author Zoe Slattery <zoe@php.net> @@ -17,11 +17,7 @@ class rtUtil public static function getTestList($aDirectory) { $result = array(); - - foreach (new rtPhptFilterIterator(new RecursiveIteratorIterator(new RecursiveDirectoryIterator($aDirectory))) as $item) { - $result[] = $item->getPathname(); - } - + $result = glob($aDirectory. "/*.phpt"); return $result; } @@ -35,13 +31,22 @@ class rtUtil */ public static function getDirectoryList($aDirectory) { - $result = array(); - - foreach (new rtPhptFilterIterator(new RecursiveIteratorIterator(new RecursiveDirectoryIterator($aDirectory))) as $directory) { - $result[] = $directory->getPath() . "/"; + $subDirectories = array(); + foreach (new RecursiveIteratorIterator(new RecursiveDirectoryIterator($aDirectory)) as $directory) { + $subDirectories[] = $directory->getPath() .. "/"; } - - return array_unique($result); + + $subDirectoriesUnique = array_unique($subDirectories); + + $phptDirectories = array(); + + foreach ($subDirectoriesUnique as $subDir) { + if(count(self::getTestList($subDir)) > 0) { + $phptDirectories[] = $subDir; + } + } + + return $phptDirectories; } } ?>