From: Andrew Davis <andrew@affinitysoftware.net>
Date: Mon, 30 Nov 2009 01:14:30 +0000 (+0000)
Subject: unit tests MDL-19060 unified the two checks for CVS directories
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=2b4d40c9acc84abf34ba4986141c2f713e78c650;p=moodle.git

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 0716a8dd48..140360c4b8 100644
--- 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)) {