Merge remote branch 'cryptocompress/patch-1'

sebastianbergmann · Jul 27, 2012 · 2035c96 · 2035c96
2 parents f302d73 + cbc9fd7
commit 2035c96
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/PHPUnit/TextUI/TestRunner.php b/PHPUnit/TextUI/TestRunner.php
@@ -593,6 +593,11 @@ protected function handleConfiguration(array &$arguments)
                 $arguments['mapTestClassNameToCoveredClassName'] = $phpunitConfiguration['mapTestClassNameToCoveredClassName'];
             }
 
+            $groupCliArgs = array();
+            if (!empty($arguments['groups'])) {
+                $groupCliArgs = $arguments['groups'];
+            }
+
             $groupConfiguration = $arguments['configuration']->getGroupConfiguration();
 
             if (!empty($groupConfiguration['include']) &&
@@ -602,7 +607,7 @@ protected function handleConfiguration(array &$arguments)
 
             if (!empty($groupConfiguration['exclude']) &&
                 !isset($arguments['excludeGroups'])) {
-                $arguments['excludeGroups'] = $groupConfiguration['exclude'];
+                $arguments['excludeGroups'] = array_diff($groupConfiguration['exclude'], $groupCliArgs);
             }
 
             foreach ($arguments['configuration']->getListenerConfiguration() as $listener) {