From fb3d83362cf25f664ecc96a61ea048901dd087f9 Mon Sep 17 00:00:00 2001
From: Kosta Harlan <kharlan@wikimedia.org>
Date: Fri, 5 Jul 2019 11:33:08 -0400
Subject: [PATCH] Reorganize testsuites

The idea is that `vendor/bin/phpunit` could run all of the tests contained in
core + extensions + skins with no overlap, but that we can also provide
granularity for CI which wants to run some testsuites (e.g. core:unit and
core:integration) before extensions/skins, as well as running unit before
integration tests.

Bug: T87781
Change-Id: I2fb57f4a9a58ec7a4042d9cc1821cc484661a6b9
---
 composer.json    |  6 +++---
 phpunit.xml.dist | 18 ++++++++++++++----
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/composer.json b/composer.json
index 07f62e2681..9240ace2e1 100644
--- a/composer.json
+++ b/composer.json
@@ -118,9 +118,9 @@
 			"composer phpcs"
 		],
 		"phpunit": "vendor/bin/phpunit",
-		"phpunit:unit": "vendor/bin/phpunit --colors=always --testsuite=unit",
-		"phpunit:integration": "vendor/bin/phpunit --colors=always --testsuite=integration",
-		"phpunit:coverage": "php -d zend_extensions=xdebug.so vendor/bin/phpunit --testsuite=unit --exclude-group Dump,Broken,ParserFuzz,Stub"
+		"phpunit:unit": "vendor/bin/phpunit --colors=always --testsuite=core:unit,extensions:unit,skins:unit",
+		"phpunit:integration": "vendor/bin/phpunit --colors=always --testsuite=core:integration,extensions:integration,skins:integration",
+		"phpunit:coverage": "vendor/bin/phpunit --testsuite=core:unit --exclude-group Dump,Broken,ParserFuzz,Stub"
 	},
 	"config": {
 		"optimize-autoloader": true,
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 159adbc3b1..2d182a6068 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -21,13 +21,23 @@
 		<ini name="memory_limit" value="512M" />
 	</php>
 	<testsuites>
-		<testsuite name="unit">
+		<testsuite name="core:unit">
 			<directory>tests/phpunit/unit</directory>
-			<directory>**/**/tests/phpunit/unit</directory>
 		</testsuite>
-		<testsuite name="integration">
+		<testsuite name="extensions:unit">
+			<directory>extensions/**/tests/phpunit/unit</directory>
+		</testsuite>
+		<testsuite name="skins:unit">
+			<directory>skins/**/tests/phpunit/unit</directory>
+		</testsuite>
+		<testsuite name="core:integration">
 			<directory>tests/phpunit/integration</directory>
-			<directory>**/**/tests/phpunit/integration</directory>
+		</testsuite>
+		<testsuite name="extensions:integration">
+			<directory>extensions/**/tests/phpunit/integration</directory>
+		</testsuite>
+		<testsuite name="skins:integration">
+			<directory>skins/**/tests/phpunit/integration</directory>
 		</testsuite>
 	</testsuites>
 	<groups>
-- 
2.20.1