Merge "Reorganize testsuites"

diff --git a/composer.json b/composer.json
index 07f62e2..9240ace 100644 (file)
--- 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 159adbc..2d182a6 100644 (file)
--- 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>