jenkins-bot has submitted this change and it was merged. Change subject: Switching from php5 to php and removing unneeded variable in Makefile ......................................................................
Switching from php5 to php and removing unneeded variable in Makefile There's no reason this should be specific to PHP version 5, plus 'php5' is not always registered as an alias to php. For example, I'm running PHP 5.4.24, but 'php5' does nothing in my environment. Removing MW_MF_INSTALL_PATH. We already have MW_INSTALL_PATH and extensions are always in the extension dir, so I don't think we need to create a separate variable for this. Change-Id: I863ced57532cc4c41afdadc1e8aaa2e3eb605455 --- M Makefile 1 file changed, 1 insertion(+), 2 deletions(-) Approvals: Krinkle: Looks good to me, approved MaxSem: Looks good to me, approved jenkins-bot: Verified diff --git a/Makefile b/Makefile index 2ee18c6..d8bc57f 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,4 @@ MW_INSTALL_PATH ?= /vagrant/mediawiki/ -MW_MF_INSTALL_PATH ?= /vagrant/mediawiki/extensions/MobileFrontend MEDIAWIKI_LOAD_URL ?= http://localhost:8080/w/load.php # From https://gist.github.com/prwhite/8168133 @@ -82,7 +81,7 @@ @dev-scripts/phplint.sh phpunit: ## Run the PHPUnit test suite - cd ${MW_INSTALL_PATH}/tests/phpunit && php5 phpunit.php ${MW_MF_INSTALL_PATH}/tests/phpunit --group=MobileFrontend + cd ${MW_INSTALL_PATH}/tests/phpunit && php phpunit.php ${MW_INSTALL_PATH}/extensions/MobileFrontend/tests/phpunit --group=MobileFrontend qunit: ## Run the QUnit test suite @dev-scripts/qunit.sh -- To view, visit https://gerrit.wikimedia.org/r/175032 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I863ced57532cc4c41afdadc1e8aaa2e3eb605455 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Kaldari <[email protected]> Gerrit-Reviewer: Awjrichards <[email protected]> Gerrit-Reviewer: Krinkle <[email protected]> Gerrit-Reviewer: MaxSem <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
