Permalink
Browse files

Merge remote branch 'cryptocompress/patch-1'

  • Loading branch information...
edorian committed Jul 27, 2012
2 parents f302d73 + cbc9fd7 commit 2035c963786b57a85556c114859668ae45a69f75
Showing with 6 additions and 1 deletion.
  1. +6 −1 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) {

0 comments on commit 2035c96

Please sign in to comment.