Skip to content

Commit 2035c96

Browse files
committed
Merge remote branch 'cryptocompress/patch-1'
2 parents f302d73 + cbc9fd7 commit 2035c96

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

PHPUnit/TextUI/TestRunner.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -593,6 +593,11 @@ protected function handleConfiguration(array &$arguments)
593593
$arguments['mapTestClassNameToCoveredClassName'] = $phpunitConfiguration['mapTestClassNameToCoveredClassName'];
594594
}
595595

596+
$groupCliArgs = array();
597+
if (!empty($arguments['groups'])) {
598+
$groupCliArgs = $arguments['groups'];
599+
}
600+
596601
$groupConfiguration = $arguments['configuration']->getGroupConfiguration();
597602

598603
if (!empty($groupConfiguration['include']) &&
@@ -602,7 +607,7 @@ protected function handleConfiguration(array &$arguments)
602607

603608
if (!empty($groupConfiguration['exclude']) &&
604609
!isset($arguments['excludeGroups'])) {
605-
$arguments['excludeGroups'] = $groupConfiguration['exclude'];
610+
$arguments['excludeGroups'] = array_diff($groupConfiguration['exclude'], $groupCliArgs);
606611
}
607612

608613
foreach ($arguments['configuration']->getListenerConfiguration() as $listener) {

0 commit comments

Comments
 (0)