From 128b7df258628e329417ef7fc493c24346b25a2d Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 12 Mar 2021 07:48:16 +0100
Subject: [PATCH] Build/test: fix code coverage reporting

---
 phpunit.xml.dist            | 52 ++++++++++++++++++-------------------
 tests/phpunit/multisite.xml | 52 ++++++++++++++++++-------------------
 2 files changed, 52 insertions(+), 52 deletions(-)

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index cebef5de31..4036f34c52 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -42,38 +42,38 @@
 	</listeners>
 	<filter>
 		<whitelist addUncoveredFilesFromWhitelist="true">
-			<directory suffix=".php">build</directory>
+			<directory suffix=".php">src</directory>
 			<exclude>
 				<!-- Third party library exclusions. -->
-				<directory suffix=".php">build/wp-includes/ID3</directory>
-				<directory suffix=".php">build/wp-includes/IXR</directory>
-				<directory suffix=".php">build/wp-includes/random_compat</directory>
-				<directory suffix=".php">build/wp-includes/PHPMailer</directory>
-				<directory suffix=".php">build/wp-includes/Requests</directory>
-				<directory suffix=".php">build/wp-includes/SimplePie</directory>
-				<directory suffix=".php">build/wp-includes/sodium_compat</directory>
-				<directory suffix=".php">build/wp-includes/Text</directory>
+				<directory suffix=".php">src/wp-includes/ID3</directory>
+				<directory suffix=".php">src/wp-includes/IXR</directory>
+				<directory suffix=".php">src/wp-includes/random_compat</directory>
+				<directory suffix=".php">src/wp-includes/PHPMailer</directory>
+				<directory suffix=".php">src/wp-includes/Requests</directory>
+				<directory suffix=".php">src/wp-includes/SimplePie</directory>
+				<directory suffix=".php">src/wp-includes/sodium_compat</directory>
+				<directory suffix=".php">src/wp-includes/Text</directory>
 
 				<!-- Plugins and themes. -->
-				<directory suffix=".php">build/wp-content/</directory>
+				<directory suffix=".php">src/wp-content/</directory>
 
-				<file>build/wp-admin/includes/class-ftp*</file>
-				<file>build/wp-admin/includes/class-pclzip.php</file>
-				<file>build/wp-admin/includes/deprecated.php</file>
-				<file>build/wp-admin/includes/ms-deprecated.php</file>
+				<file>src/wp-admin/includes/class-ftp*</file>
+				<file>src/wp-admin/includes/class-pclzip.php</file>
+				<file>src/wp-admin/includes/deprecated.php</file>
+				<file>src/wp-admin/includes/ms-deprecated.php</file>
 
-				<file>build/wp-includes/atomlib.php</file>
-				<file>build/wp-includes/class-IXR.php</file>
-				<file>build/wp-includes/class-json.php</file>
-				<file>build/wp-includes/class-phpass.php</file>
-				<file>build/wp-includes/class-pop3.php</file>
-				<file>build/wp-includes/class-requests.php</file>
-				<file>build/wp-includes/class-simplepie.php</file>
-				<file>build/wp-includes/class-snoopy.php</file>
-				<file>build/wp-includes/deprecated.php</file>
-				<file>build/wp-includes/ms-deprecated.php</file>
-				<file>build/wp-includes/pluggable-deprecated.php</file>
-				<file>build/wp-includes/rss.php</file>
+				<file>src/wp-includes/atomlib.php</file>
+				<file>src/wp-includes/class-IXR.php</file>
+				<file>src/wp-includes/class-json.php</file>
+				<file>src/wp-includes/class-phpass.php</file>
+				<file>src/wp-includes/class-pop3.php</file>
+				<file>src/wp-includes/class-requests.php</file>
+				<file>src/wp-includes/class-simplepie.php</file>
+				<file>src/wp-includes/class-snoopy.php</file>
+				<file>src/wp-includes/deprecated.php</file>
+				<file>src/wp-includes/ms-deprecated.php</file>
+				<file>src/wp-includes/pluggable-deprecated.php</file>
+				<file>src/wp-includes/rss.php</file>
 			</exclude>
 		</whitelist>
 	</filter>
diff --git a/tests/phpunit/multisite.xml b/tests/phpunit/multisite.xml
index b2ac638609..8cbc2a5404 100644
--- a/tests/phpunit/multisite.xml
+++ b/tests/phpunit/multisite.xml
@@ -41,38 +41,38 @@
 	</listeners>
 	<filter>
 		<whitelist addUncoveredFilesFromWhitelist="true">
-			<directory suffix=".php">../../build</directory>
+			<directory suffix=".php">../../src</directory>
 			<exclude>
 				<!-- Third party library exclusions. -->
-				<directory suffix=".php">../../build/wp-includes/ID3</directory>
-				<directory suffix=".php">../../build/wp-includes/IXR</directory>
-				<directory suffix=".php">../../build/wp-includes/random_compat</directory>
-				<directory suffix=".php">../../build/wp-includes/PHPMailer</directory>
-				<directory suffix=".php">../../build/wp-includes/Requests</directory>
-				<directory suffix=".php">../../build/wp-includes/SimplePie</directory>
-				<directory suffix=".php">../../build/wp-includes/sodium_compat</directory>
-				<directory suffix=".php">../../build/wp-includes/Text</directory>
+				<directory suffix=".php">../../src/wp-includes/ID3</directory>
+				<directory suffix=".php">../../src/wp-includes/IXR</directory>
+				<directory suffix=".php">../../src/wp-includes/random_compat</directory>
+				<directory suffix=".php">../../src/wp-includes/PHPMailer</directory>
+				<directory suffix=".php">../../src/wp-includes/Requests</directory>
+				<directory suffix=".php">../../src/wp-includes/SimplePie</directory>
+				<directory suffix=".php">../../src/wp-includes/sodium_compat</directory>
+				<directory suffix=".php">../../src/wp-includes/Text</directory>
 
 				<!-- Plugins and themes. -->
-				<directory suffix=".php">../../build/wp-content/</directory>
+				<directory suffix=".php">../../src/wp-content/</directory>
 
-				<file>../../build/wp-admin/includes/class-ftp*</file>
-				<file>../../build/wp-admin/includes/class-pclzip.php</file>
-				<file>../../build/wp-admin/includes/deprecated.php</file>
-				<file>../../build/wp-admin/includes/ms-deprecated.php</file>
+				<file>../../src/wp-admin/includes/class-ftp*</file>
+				<file>../../src/wp-admin/includes/class-pclzip.php</file>
+				<file>../../src/wp-admin/includes/deprecated.php</file>
+				<file>../../src/wp-admin/includes/ms-deprecated.php</file>
 
-				<file>../../build/wp-includes/atomlib.php</file>
-				<file>../../build/wp-includes/class-IXR.php</file>
-				<file>../../build/wp-includes/class-json.php</file>
-				<file>../../build/wp-includes/class-phpass.php</file>
-				<file>../../build/wp-includes/class-pop3.php</file>
-				<file>../../build/wp-includes/class-requests.php</file>
-				<file>../../build/wp-includes/class-simplepie.php</file>
-				<file>../../build/wp-includes/class-snoopy.php</file>
-				<file>../../build/wp-includes/deprecated.php</file>
-				<file>../../build/wp-includes/ms-deprecated.php</file>
-				<file>../../build/wp-includes/pluggable-deprecated.php</file>
-				<file>../../build/wp-includes/rss.php</file>
+				<file>../../src/wp-includes/atomlib.php</file>
+				<file>../../src/wp-includes/class-IXR.php</file>
+				<file>../../src/wp-includes/class-json.php</file>
+				<file>../../src/wp-includes/class-phpass.php</file>
+				<file>../../src/wp-includes/class-pop3.php</file>
+				<file>../../src/wp-includes/class-requests.php</file>
+				<file>../../src/wp-includes/class-simplepie.php</file>
+				<file>../../src/wp-includes/class-snoopy.php</file>
+				<file>../../src/wp-includes/deprecated.php</file>
+				<file>../../src/wp-includes/ms-deprecated.php</file>
+				<file>../../src/wp-includes/pluggable-deprecated.php</file>
+				<file>../../src/wp-includes/rss.php</file>
 			</exclude>
 		</whitelist>
 	</filter>
-- 
2.30.2.windows.1