- Merge [3845].

sebastianbergmann · Oct 15, 2008 · 0b190e3 · 0b190e3
1 parent 3deb428
commit 0b190e3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/PHPUnit/TextUI/Command.php b/PHPUnit/TextUI/Command.php
@@ -543,11 +543,20 @@ protected static function handleArguments()
             $arguments['configuration'] = realpath('phpunit.xml');
         }
 
-        if (!isset($arguments['test']) && isset($arguments['configuration'])) {
+        if (isset($arguments['configuration'])) {
             $configuration = new PHPUnit_Util_Configuration(
               $arguments['configuration']
             );
 
+            $browsers = $configuration->getSeleniumBrowserConfiguration();
+
+            if (!empty($browsers)) {
+                require_once 'PHPUnit/Extensions/SeleniumTestCase.php';
+                PHPUnit_Extensions_SeleniumTestCase::$browsers = $browsers;
+            }
+        }
+
+        if (!isset($arguments['test']) && isset($configuration)) {
             $configuration->handlePHPConfiguration();
             $testSuite = $configuration->getTestSuiteConfiguration();
 

diff --git a/PHPUnit/TextUI/TestRunner.php b/PHPUnit/TextUI/TestRunner.php
@@ -751,13 +751,6 @@ protected function handleConfiguration(array &$arguments)
             if (isset($loggingConfiguration['testdox-text']) && !isset($arguments['testdoxTextFile'])) {
                 $arguments['testdoxTextFile'] = $loggingConfiguration['testdox-text'];
             }
-
-            $browsers = $arguments['configuration']->getSeleniumBrowserConfiguration();
-
-            if (!empty($browsers)) {
-                require_once 'PHPUnit/Extensions/SeleniumTestCase.php';
-                PHPUnit_Extensions_SeleniumTestCase::$browsers = $browsers;
-            }
         }
 
         $arguments['cpdMinLines']                 = isset($arguments['cpdMinLines'])                 ? $arguments['cpdMinLines']                 : 5;