Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/95552
Change subject: let us easily override PHPUnit version ...................................................................... let us easily override PHPUnit version The new --with-phpunitdir let us specify a git checkout of PHPUnit. That will ease regression testing of the upstream new version. Usage is straightforward: Checkout PHPUnit from git as instructed on: https://github.com/sebastianbergmann/phpunit#readme Invoke our test suite with: $ cd maintenance/tests $ php phpunit.php --with-phpunitdir /path/you/just/checked/out Cherry-picked from 3b9a3678b35ba6c2c4158d230393161a37f21e86 Change-Id: I8a9af0deac4dd74e3c8bde73535555c54ac83766 --- M tests/phpunit/phpunit.php 1 file changed, 49 insertions(+), 9 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/52/95552/1 diff --git a/tests/phpunit/phpunit.php b/tests/phpunit/phpunit.php index 92eeffa..7486a78 100755 --- a/tests/phpunit/phpunit.php +++ b/tests/phpunit/phpunit.php @@ -18,6 +18,16 @@ require_once( "$IP/maintenance/Maintenance.php" ); class PHPUnitMaintClass extends Maintenance { + + function __construct() { + parent::__construct(); + $this->addOption( 'with-phpunitdir' + , 'Directory to include PHPUnit from, for example when using a git fetchout from upstream. Path will be prepended to PHP `include_path`.' + , false # not required + , true # need arg + ); + } + public function finalSetup() { parent::finalSetup(); @@ -35,7 +45,42 @@ $wgLocalisationCacheConf['storeClass'] = 'LCStore_Null'; } - public function execute() { } + + public function execute() { + global $IP; + + # Make sure we have --configuration or PHPUnit might complain + if( !in_array( '--configuration', $_SERVER['argv'] ) ) { + //Hack to eliminate the need to use the Makefile (which sucks ATM) + array_splice( $_SERVER['argv'], 1, 0, + array( '--configuration', $IP . '/tests/phpunit/suite.xml' ) ); + } + + # --with-phpunitdir let us override the default PHPUnit version + if( $phpunitDir = $this->getOption( 'with-phpunitdir' ) ) { + # Sanity checks + if( !is_dir($phpunitDir) ) { + $this->error( "--with-phpunitdir should be set to an existing directory", 1 ); + } + if( !is_readable( $phpunitDir."/PHPUnit/Runner/Version.php" ) ) { + $this->error( "No usable PHPUnit installation in $phpunitDir.\nAborting.\n", 1 ); + } + + # Now prepends provided PHPUnit directory + $this->output( "Will attempt loading PHPUnit from `$phpunitDir`\n" ); + set_include_path( $phpunitDir + . PATH_SEPARATOR . get_include_path() ); + + # Cleanup $args array so the option and its value do not + # pollute PHPUnit + $key = array_search( '--with-phpunitdir', $_SERVER['argv'] ); + unset( $_SERVER['argv'][$key] ); // the option + unset( $_SERVER['argv'][$key+1] ); // its value + $_SERVER['argv'] = array_values( $_SERVER['argv'] ); + + } + } + public function getDbType() { return Maintenance::DB_ADMIN; } @@ -44,18 +89,13 @@ $maintClass = 'PHPUnitMaintClass'; require( RUN_MAINTENANCE_IF_MAIN ); -if( !in_array( '--configuration', $_SERVER['argv'] ) ) { - //Hack to eliminate the need to use the Makefile (which sucks ATM) - array_splice( $_SERVER['argv'], 1, 0, - array( '--configuration', $IP . '/tests/phpunit/suite.xml' ) ); -} - require_once( 'PHPUnit/Runner/Version.php' ); -if( version_compare( PHPUnit_Runner_Version::id(), '3.5.0', '<' ) ) { + +if( PHPUnit_Runner_Version::id() !== '@package_version@' + && version_compare( PHPUnit_Runner_Version::id(), '3.5.0', '<' ) ) { die( 'PHPUnit 3.5 or later required, you have ' . PHPUnit_Runner_Version::id() . ".\n" ); } require_once( 'PHPUnit/Autoload.php' ); require_once( "$IP/tests/TestsAutoLoader.php" ); MediaWikiPHPUnitCommand::main(); - -- To view, visit https://gerrit.wikimedia.org/r/95552 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8a9af0deac4dd74e3c8bde73535555c54ac83766 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: REL1_19 Gerrit-Owner: Hashar <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
