[Simpletest-devel] SF.net SVN: simpletest:[1841] simpletest/trunk/autorun.php

[<edw...@us...>]

Revision: 1841
          http://simpletest.svn.sourceforge.net/simpletest/?rev=1841&view=rev
Author:   edwardzyang
Date:     2008-12-21 22:33:44 +0000 (Sun, 21 Dec 2008)

Log Message:
-----------
Remove unnecessary check for test suites to be in the same file.

Modified Paths:
--------------
    simpletest/trunk/autorun.php

Modified: simpletest/trunk/autorun.php
===================================================================
--- simpletest/trunk/autorun.php	2008-12-21 19:02:21 UTC (rev 1840)
+++ simpletest/trunk/autorun.php	2008-12-21 22:33:44 UTC (rev 1841)
@@ -23,9 +23,7 @@
         if (tests_have_run()) {
             return;
         }
-        $candidates = array_intersect(
-                capture_new_classes(),
-                classes_defined_in_initial_file());
+        $candidates = capture_new_classes();
         $loader = new SimpleFileLoader();
         $suite = $loader->createSuiteFromClasses(
                 basename(initial_file()),
@@ -70,20 +68,6 @@
 }
 
 /**
- *    Just the classes from the first autorun script. May
- *    get a few false positives, as it just does a regex based
- *    on following the word "class".
- *    @return array        List of all possible classes in first
- *                         autorun script.
- */
-function classes_defined_in_initial_file() {
-    if (preg_match_all('/\bclass\s+(\w+)/i', file_get_contents(initial_file()), $matches)) {
-        return array_map('strtolower', $matches[1]);
-    }
-    return array();
-}
-
-/**
  *    Every class since the first autorun include. This
  *    is safe enough if require_once() is always used.
  *    @return array        Class names.


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.