<!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>[BuddyPress][11001] trunk: Travis-CI: disable xdebug globally and switch `travis:codecoverage` to use xdebug instead of phpdbg.</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 { 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="http://buddypress.trac.wordpress.org/changeset/11001">11001</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://buddypress.trac.wordpress.org/changeset/11001","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>djpaul</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-08-08 13:36:32 +0000 (Mon, 08 Aug 2016)</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'>Travis-CI: disable xdebug globally and switch `travis:codecoverage` to use xdebug instead of phpdbg.
In <a href="http://buddypress.trac.wordpress.org/changeset/10997">r10997</a>, we set up a code coverage task which used phpdbg to speed up code coverage report generation.
Iteration and further testing has shown the Travis-CI environment will not support our particular project
layout with phpdbg. This commit simplifies the code coverage to use xdebug.
xdebug has also been globally disabled on Travis-CI (the code coverage task explicitly re-enables it)
because we are not relying on it for any parts of our existing tests, and doing so should speed up
running the unit tests.
See <a href="http://buddypress.trac.wordpress.org/ticket/7207">#7207</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktravisyml">trunk/.travis.yml</a></li>
<li><a href="#trunkGruntfilejs">trunk/Gruntfile.js</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunktestsphpunitcodecoveragexml">trunk/tests/phpunit/codecoverage.xml</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkcodecoveragexml">trunk/codecoverage.xml</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktravisyml"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/.travis.yml</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/.travis.yml 2016-08-07 17:48:21 UTC (rev 11000)
+++ trunk/.travis.yml 2016-08-08 13:36:32 UTC (rev 11001)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -65,8 +65,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> - plugin_dir=$WP_DEVELOP_DIR/src/wp-content/plugins/$plugin_slug
</span><span class="cx" style="display: block; padding: 0 10px"> - cd ..
</span><span class="cx" style="display: block; padding: 0 10px"> - mv $plugin_slug $plugin_dir
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- # Disable xdebug if running codecoverage (use phpdbg instead).
- - if [[ "$BP_TRAVISCI" == "travis:codecoverage" ]] ; then phpenv config-rm xdebug.ini; fi
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ # Disable xdebug if not running codecoverage.
+ - if [[ "$BP_TRAVISCI" != "travis:codecoverage" ]] ; then phpenv config-rm xdebug.ini; fi
</ins><span class="cx" style="display: block; padding: 0 10px"> # set up tests config
</span><span class="cx" style="display: block; padding: 0 10px"> - cd $WP_DEVELOP_DIR
</span><span class="cx" style="display: block; padding: 0 10px"> - echo $WP_DEVELOP_DIR
</span></span></pre></div>
<a id="trunkGruntfilejs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/Gruntfile.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/Gruntfile.js 2016-08-07 17:48:21 UTC (rev 11000)
+++ trunk/Gruntfile.js 2016-08-08 13:36:32 UTC (rev 11001)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -214,10 +214,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> cmd: 'phpunit',
</span><span class="cx" style="display: block; padding: 0 10px"> args: ['-c', 'tests/phpunit/multisite.xml']
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Requires PHP 7+
</del><span class="cx" style="display: block; padding: 0 10px"> 'codecoverage': {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- cmd: 'phpdbg',
- args: ['-qrr', grunt.config.get( 'BP_PHPUNIT' ), '-c', 'codecoverage.xml', '--coverage-clover', 'clover.xml' ]
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ cmd: 'phpunit',
+ args: ['-c', 'tests/phpunit/codecoverage.xml' ]
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> exec: {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -230,13 +229,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> command: 'svn export --force https://github.com/buddypress/BP-Default.git/trunk bp-themes/bp-default',
</span><span class="cx" style="display: block; padding: 0 10px"> cwd: BUILD_DIR,
</span><span class="cx" style="display: block; padding: 0 10px"> stdout: false
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- },
- find_phpunit: {
- command: 'which phpunit',
- stdout: false,
- callback: function (error, stdout) {
- grunt.config.set( 'BP_PHPUNIT', stdout );
- }
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> jsvalidate:{
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -293,7 +285,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Travis CI Tasks.
</span><span class="cx" style="display: block; padding: 0 10px"> grunt.registerTask( 'travis:grunt', 'Runs Grunt build task.', [ 'build' ]);
</span><span class="cx" style="display: block; padding: 0 10px"> grunt.registerTask( 'travis:phpunit', ['jsvalidate:src', 'jshint', 'checktextdomain', 'test'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- grunt.registerTask( 'travis:codecoverage', 'Runs PHPUnit tasks with code-coverage generation. Requires PHP7+.', [ 'exec:find_phpunit', 'phpunit:codecoverage' ]);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ grunt.registerTask( 'travis:codecoverage', 'Runs PHPUnit tasks with code-coverage generation.', ['phpunit:codecoverage'] );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Patch task.
</span><span class="cx" style="display: block; padding: 0 10px"> grunt.renameTask( 'patch_wordpress', 'patch' );
</span></span></pre></div>
<a id="trunkcodecoveragexml"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: trunk/codecoverage.xml</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/codecoverage.xml 2016-08-07 17:48:21 UTC (rev 11000)
+++ trunk/codecoverage.xml 2016-08-08 13:36:32 UTC (rev 11001)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,26 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<phpunit
- bootstrap="tests/phpunit/bootstrap.php"
- backupGlobals="false"
- colors="true"
- convertErrorsToExceptions="true"
- convertNoticesToExceptions="true"
- convertWarningsToExceptions="true"
- >
- <testsuites>
- <testsuite>
- <directory suffix=".php">tests/phpunit/testcases/</directory>
- </testsuite>
- </testsuites>
- <filter>
- <blacklist>
- <directory suffix=".php">.</directory>
- </blacklist>
- <whitelist>
- <directory suffix=".php">./src</directory>
- <file>./bp-loader.php</file>
- </whitelist>
- </filter>
- <logging>
- <log type="coverage-clover" target="clover.xml"/>
- </logging>
-</phpunit>
</del></span></pre></div>
<a id="trunktestsphpunitcodecoveragexml"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/tests/phpunit/codecoverage.xml</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/codecoverage.xml (rev 0)
+++ trunk/tests/phpunit/codecoverage.xml 2016-08-08 13:36:32 UTC (rev 11001)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,23 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<phpunit
+ bootstrap="bootstrap.php"
+ backupGlobals="false"
+ colors="true"
+ convertErrorsToExceptions="true"
+ convertNoticesToExceptions="true"
+ convertWarningsToExceptions="true"
+ >
+ <testsuites>
+ <testsuite>
+ <directory suffix=".php">./testcases/</directory>
+ </testsuite>
+ </testsuites>
+ <filter>
+ <whitelist>
+ <directory suffix=".php">../../src/</directory>
+ <file>../../bp-loader.php</file>
+ </whitelist>
+ </filter>
+ <logging>
+ <log type="coverage-clover" target="../../clover.xml"/>
+ </logging>
+</phpunit>
</ins></span></pre>
</div>
</div>
</body>
</html>