Changeset 11001

Timestamp:

08/08/2016 01:36:32 PM (10 years ago)

Author:

djpaul

Message:

Travis-CI: disable xdebug globally and switch travis:codecoverage to use xdebug instead of phpdbg.

In r10997, 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 #7207

Location:

trunk

Files:

• .travis.yml (modified) (1 diff)
• Gruntfile.js (modified) (3 diffs)
• codecoverage.xml (deleted)
• tests/phpunit/codecoverage.xml (added)

trunk/.travis.yml

@@ -66 +66 @@
   - cd ..
   - mv $plugin_slug $plugin_dir
-  # Disable xdebug if running codecoverage (use phpdbg instead).
-  - if [[ "$BP_TRAVISCI" == "travis:codecoverage" ]] ; then phpenv config-rm xdebug.ini; fi
+  # Disable xdebug if not running codecoverage.
+  - if [[ "$BP_TRAVISCI" != "travis:codecoverage" ]] ; then phpenv config-rm xdebug.ini; fi
   # set up tests config
   - cd $WP_DEVELOP_DIR

trunk/Gruntfile.js

@@ -215 +215 @@
                                 args: ['-c', 'tests/phpunit/multisite.xml']
                         },
-                        // Requires PHP 7+
                         'codecoverage': {
-                                cmd: 'phpdbg',
-                                args: ['-qrr', grunt.config.get( 'BP_PHPUNIT' ), '-c', 'codecoverage.xml', '--coverage-clover', 'clover.xml' ]
+                                cmd: 'phpunit',
+                                args: ['-c', 'tests/phpunit/codecoverage.xml' ]
                         }
                 },
@@ -231 +230 @@
                                 cwd: BUILD_DIR,
                                 stdout: false
-                        },
-                        find_phpunit: {
-                                command: 'which phpunit',
-                                stdout: false,
-                                callback: function (error, stdout) {
-                                        grunt.config.set( 'BP_PHPUNIT', stdout );
-                                }
                         }
                 },
@@ -294 +286 @@
         grunt.registerTask( 'travis:grunt', 'Runs Grunt build task.', [ 'build' ]);
         grunt.registerTask( 'travis:phpunit', ['jsvalidate:src', 'jshint', 'checktextdomain', 'test'] );
-        grunt.registerTask( 'travis:codecoverage', 'Runs PHPUnit tasks with code-coverage generation. Requires PHP7+.', [ 'exec:find_phpunit', 'phpunit:codecoverage' ]);
+        grunt.registerTask( 'travis:codecoverage', 'Runs PHPUnit tasks with code-coverage generation.', ['phpunit:codecoverage'] );
 
         // Patch task.