Index: AllTests.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/phpunit/AllTests.php,v
retrieving revision 1.2
diff -u -r1.2 AllTests.php
--- AllTests.php	24 Feb 2009 07:37:57 -0000	1.2
+++ AllTests.php	13 Mar 2009 07:01:33 -0000
@@ -5,37 +5,27 @@
 * Find and run all Drupal Test Cases as a Test Suite. 
 *
 * @package DrupalTest
-* @author  Jonathan H. Wage <jonwage@gmail.com>
+* @author Jonathan H. Wage <jonwage@gmail.com>
+* @author Christopher Hopper <christopher.jf.hopper@gmail.com>
 */
 
-if ( ! defined('PHPUnit_MAIN_METHOD')) {
-  define('PHPUnit_MAIN_METHOD', 'AllTests::main');
-}
-
 require_once realpath(dirname(__FILE__) . '/..') . '/phpunit/Initialize.php';
 
 /**
 * All Drupal Tests
 *
-* This test suite will find all Drupal modules that have test suites named All*Tests.php and will
-* add it to this suite to be executed. Individual module suites can be run directly with
-* the phpunit command
+* This test suite will find all Drupal modules that have test suites 
+* named *AllTests.php and will add it to this suite to be executed. 
+* Individual module suites can be run directly with the phpunit command. 
 *
 * @package DrupalTest
 * @author  Jonathan H. Wage <jonwage@gmail.com>
 */
-class AllTests
-{
-  public static function main()
-  {
-    PHPUnit_TextUI_TestRunner::run(self::suite());
-  }
-
-  public static function suite()
-  {
+class AllTests {
+  public static function suite() {
     $suite = new DrupalTest_TestSuite('All Drupal Tests');
 
-    $path = realpath(dirname(__FILE__) . '/..') . '/*/tests/*_AllTests.php';
+    $path = realpath(dirname(__FILE__) . '/..') . '/*/tests/*AllTests.php';
 
     $moduleSuitePaths = glob($path);
 
@@ -49,7 +39,3 @@
     return $suite;
   }
 }
-
-if (PHPUnit_MAIN_METHOD == 'AllTests::main') {
-  AllTests::main();
-}
\ No newline at end of file