<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[50592] trunk: Build/Test Tools: Fix code coverage reporting to generate report from `src`.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/50592">50592</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/50592","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>desrosj</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2021-03-26 13:23:52 +0000 (Fri, 26 Mar 2021)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Build/Test Tools: Fix code coverage reporting to generate report from `src`.
Since [50441-50442] switched the test workflows to run from `src` instead of `build`, code coverage reporting has stopped working. This was caused by the code coverage configuration continuing to reference `build`. This corrects the configuration so coverage reporting can resume.
This change also introduces the `workflow_dispatch` event to the workflow, which will allow committers to manually run the workflow when desired. For example, to confirm changes to the test suite do not break reporting.
This also adds the `phpunit.xml.dist` and `tests/phpunit/multisite.xml` files to the `paths` list. Since these files are responsible for configuring the test suite and code coverage reporting, any changes to them should verify that no problems were introduced.
Props jrf, johnbillion.
Fixes <a href="https://core.trac.wordpress.org/ticket/52786">#52786</a>. See <a href="https://core.trac.wordpress.org/ticket/51734">#51734</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkgithubworkflowstestcoverageyml">trunk/.github/workflows/test-coverage.yml</a></li>
<li><a href="#trunkphpunitxmldist">trunk/phpunit.xml.dist</a></li>
<li><a href="#trunktestsphpunitmultisitexml">trunk/tests/phpunit/multisite.xml</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkgithubworkflowstestcoverageyml"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/.github/workflows/test-coverage.yml</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/.github/workflows/test-coverage.yml 2021-03-26 13:16:23 UTC (rev 50591)
+++ trunk/.github/workflows/test-coverage.yml 2021-03-26 13:23:52 UTC (rev 50592)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,9 +1,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> name: Code Coverage Report
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> on:
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ # Verify
+ push:
+ branches:
+ - master
+ - trunk
+ paths:
+ - 'phpunit.xml.dist'
+ - 'tests/phpunit/multisite.xml'
</ins><span class="cx" style="display: block; padding: 0 10px"> # Once daily at 00:00 UTC.
</span><span class="cx" style="display: block; padding: 0 10px"> schedule:
</span><span class="cx" style="display: block; padding: 0 10px"> - cron: '0 0 * * *'
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ # Allow manually triggering the workflow.
+ workflow_dispatch:
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> env:
</span><span class="cx" style="display: block; padding: 0 10px"> PUPPETEER_SKIP_CHROMIUM_DOWNLOAD: ${{ true }}
</span></span></pre></div>
<a id="trunkphpunitxmldist"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/phpunit.xml.dist</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/phpunit.xml.dist 2021-03-26 13:16:23 UTC (rev 50591)
+++ trunk/phpunit.xml.dist 2021-03-26 13:23:52 UTC (rev 50592)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -42,38 +42,38 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </listeners>
</span><span class="cx" style="display: block; padding: 0 10px"> <filter>
</span><span class="cx" style="display: block; padding: 0 10px"> <whitelist addUncoveredFilesFromWhitelist="true">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <directory suffix=".php">build</directory>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <directory suffix=".php">src</directory>
</ins><span class="cx" style="display: block; padding: 0 10px"> <exclude>
</span><span class="cx" style="display: block; padding: 0 10px"> <!-- Third party library exclusions. -->
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <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>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <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>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <!-- Plugins and themes. -->
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <directory suffix=".php">build/wp-content/</directory>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <directory suffix=".php">src/wp-content/</directory>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <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>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <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>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <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>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <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>
</ins><span class="cx" style="display: block; padding: 0 10px"> </exclude>
</span><span class="cx" style="display: block; padding: 0 10px"> </whitelist>
</span><span class="cx" style="display: block; padding: 0 10px"> </filter>
</span></span></pre></div>
<a id="trunktestsphpunitmultisitexml"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/multisite.xml</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/multisite.xml 2021-03-26 13:16:23 UTC (rev 50591)
+++ trunk/tests/phpunit/multisite.xml 2021-03-26 13:23:52 UTC (rev 50592)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -41,38 +41,38 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </listeners>
</span><span class="cx" style="display: block; padding: 0 10px"> <filter>
</span><span class="cx" style="display: block; padding: 0 10px"> <whitelist addUncoveredFilesFromWhitelist="true">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <directory suffix=".php">../../build</directory>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <directory suffix=".php">../../src</directory>
</ins><span class="cx" style="display: block; padding: 0 10px"> <exclude>
</span><span class="cx" style="display: block; padding: 0 10px"> <!-- Third party library exclusions. -->
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <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>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <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>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <!-- Plugins and themes. -->
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <directory suffix=".php">../../build/wp-content/</directory>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <directory suffix=".php">../../src/wp-content/</directory>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <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>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <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>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <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>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <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>
</ins><span class="cx" style="display: block; padding: 0 10px"> </exclude>
</span><span class="cx" style="display: block; padding: 0 10px"> </whitelist>
</span><span class="cx" style="display: block; padding: 0 10px"> </filter>
</span></span></pre>
</div>
</div>
</body>
</html>