unit tests MDL-19060 unified the two checks for CVS directories

diff --git a/admin/report/unittest/ex_simple_test.php b/admin/report/unittest/ex_simple_test.php
index 0716a8dd486e3055c590c01e720f6208c4ecb83b..140360c4b834341ae4634c1474c52b5cd1c3057e 100644 (file)
--- a/admin/report/unittest/ex_simple_test.php
+++ b/admin/report/unittest/ex_simple_test.php
@@ -61,8 +61,8 @@ class AutoGroupTest extends TestSuite {
                 continue;
             }
             $file_path = $path . '/' . $file;
-            if (is_dir($file_path) && !preg_match('/CVS/i',$file) && !preg_match('/.git/i',$file)) {
-                if ($file != 'CVS' && !in_array($file_path, $this->ignorefolders)) {
+            if (is_dir($file_path)) {
+                if ($file != 'CVS' && $file != '.git' && !in_array($file_path, $this->ignorefolders)) {
                     $this->_recurseFolders($file_path);
                 }
             } elseif (preg_match('/simpletest(\/|\\\\)test.*\.php$/', $file_path)) {