From 6ade9e135e42c8834f0a7f809e8639e35d754e0f Mon Sep 17 00:00:00 2001
From: Jeroen Dalsem <jdalsem@coldtrick.com>
Date: Fri, 14 Jan 2022 10:17:12 +0100
Subject: [PATCH 1/2] chore(tests): updated in/exclude list for code coverage

---
 phpunit.xml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/phpunit.xml b/phpunit.xml
index 46e4ffea38d..273bfcccafa 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -8,7 +8,6 @@
       <directory suffix=".php">./mod/*/actions</directory>
       <directory suffix=".php">./mod/*/lib</directory>
       <directory suffix=".php">./mod/*/classes</directory>
-      <directory suffix="start.php">./mod/*</directory>
     </include>
     <exclude>
       <directory suffix=".php">./elgg-config</directory>
@@ -19,8 +18,8 @@
       <directory suffix=".php">*/bower_components/*</directory>
       <directory suffix=".php">*/node_modules/*</directory>
       <directory suffix=".php">*/docs/*</directory>
-      <directory suffix=".php">*/engine/schema/*</directory>
-      <directory suffix=".php">*/engine/lib/upgrades/*</directory>
+      <directory suffix=".php">./engine/schema/*</directory>
+      <directory suffix=".php">./engine/vendor_classes/*</directory>
       <directory suffix=".php">./languages</directory>
       <directory suffix=".php">./views</directory>
       <directory suffix=".php">./mod/*/languages</directory>

From 544bed04ff142d6917436400439344dce6d3ec5e Mon Sep 17 00:00:00 2001
From: Jeroen Dalsem <jdalsem@coldtrick.com>
Date: Fri, 14 Jan 2022 10:52:11 +0100
Subject: [PATCH 2/2] chore(tests): split code coverage into more sub suites

---
 .github/workflows/codecoverage.yml |  2 +-
 phpunit.xml                        | 43 ++++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/codecoverage.yml b/.github/workflows/codecoverage.yml
index 6b14da50c2d..7b824b858ff 100644
--- a/.github/workflows/codecoverage.yml
+++ b/.github/workflows/codecoverage.yml
@@ -15,7 +15,7 @@ jobs:
       fail-fast: false
       matrix:
         # Keep number of suites inline with scrutinizer waiting for the same amount of coverage runs
-        testsuite: ['unit', 'integration', 'plugins-unit', 'plugins-integration']
+        testsuite: ['unit', 'integration-a-to-d', 'integration-e-to-p', 'integration-q-to-all', 'plugins-unit', 'plugins-integration']
 
     steps:
       - name: Check if run on the Elgg repo
diff --git a/phpunit.xml b/phpunit.xml
index 273bfcccafa..9bc3342034e 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -72,5 +72,48 @@
     <testsuite name="plugins-integration">
       <directory>./mod/*/tests/phpunit/integration/</directory>
     </testsuite>
+    <!-- The following suites are used to segment code coverage jobs -->
+    <testsuite name="integration-a-to-d">
+      <directory>./engine/tests/phpunit/integration/Elgg/Actions/</directory>
+      <directory>./engine/tests/phpunit/integration/Elgg/Ajax/</directory>
+      <directory>./engine/tests/phpunit/integration/Elgg/Assets/</directory>
+      <directory>./engine/tests/phpunit/integration/Elgg/Cli/</directory>
+      <directory>./engine/tests/phpunit/integration/Elgg/Comments/</directory>
+      <directory>./engine/tests/phpunit/integration/Elgg/Controllers/</directory>
+      <directory>./engine/tests/phpunit/integration/Elgg/Database/</directory>
+      <directory>./engine/tests/phpunit/integration/Elgg/Di/</directory>
+    </testsuite>
+    <testsuite name="integration-e-to-p">
+      <directory>./engine/tests/phpunit/integration/Elgg/Email/</directory>
+      <directory>./engine/tests/phpunit/integration/Elgg/Forms/</directory>
+      <directory>./engine/tests/phpunit/integration/Elgg/Http/</directory>
+      <directory>./engine/tests/phpunit/integration/Elgg/I18n/</directory>
+      <directory>./engine/tests/phpunit/integration/Elgg/Integration/</directory>
+      <directory>./engine/tests/phpunit/integration/Elgg/Lib/</directory>
+      <directory>./engine/tests/phpunit/integration/Elgg/Navigation/</directory>
+      <directory>./engine/tests/phpunit/integration/Elgg/Notifications/</directory>
+      <directory>./engine/tests/phpunit/integration/Elgg/Plugin/</directory>
+    </testsuite>
+    <testsuite name="integration-q-to-all">
+      <directory>./engine/tests/phpunit/integration/</directory>
+      
+      <exclude>engine/tests/phpunit/integration/Elgg/Actions/</exclude>
+      <exclude>engine/tests/phpunit/integration/Elgg/Ajax/</exclude>
+      <exclude>engine/tests/phpunit/integration/Elgg/Assets/</exclude>
+      <exclude>engine/tests/phpunit/integration/Elgg/Cli/</exclude>
+      <exclude>engine/tests/phpunit/integration/Elgg/Comments/</exclude>
+      <exclude>engine/tests/phpunit/integration/Elgg/Controllers/</exclude>
+      <exclude>engine/tests/phpunit/integration/Elgg/Database/</exclude>
+      <exclude>engine/tests/phpunit/integration/Elgg/Di/</exclude>
+      <exclude>engine/tests/phpunit/integration/Elgg/Email/</exclude>
+      <exclude>engine/tests/phpunit/integration/Elgg/Forms/</exclude>
+      <exclude>engine/tests/phpunit/integration/Elgg/Http/</exclude>
+      <exclude>engine/tests/phpunit/integration/Elgg/I18n/</exclude>
+      <exclude>engine/tests/phpunit/integration/Elgg/Integration/</exclude>
+      <exclude>engine/tests/phpunit/integration/Elgg/Lib/</exclude>
+      <exclude>engine/tests/phpunit/integration/Elgg/Navigation/</exclude>
+      <exclude>engine/tests/phpunit/integration/Elgg/Notifications/</exclude>
+      <exclude>engine/tests/phpunit/integration/Elgg/Plugin/</exclude>
+    </testsuite>
   </testsuites>
 </phpunit>