jenkins-bot has submitted this change and it was merged.
Change subject: mw-phpunit: Remove spurious --conf parameter to phpunit
......................................................................
mw-phpunit: Remove spurious --conf parameter to phpunit
* MediaWiki's phpunit.php file doesn't use this parameter.
* Under PHPUnit 3.7.x, this parameter doesn't exist.
* Under PHPUnit 4.8.x, this parameter exists and relates
to phpunit.xml configuration (alias for --configuration) and
this makes it fail:
> Could not load "/mnt/jenkins-workspace/workspace/…/src/LocalSettings.php".
> Start tag expected, '<' not found
> Build step 'Execute shell' marked build as failure
Bug: T99982
Change-Id: I95d5f3d9b954beed9d30445fc933ae3bc900350e
---
M bin/mw-phpunit.sh
1 file changed, 0 insertions(+), 1 deletion(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/bin/mw-phpunit.sh b/bin/mw-phpunit.sh
index 23d04ef..d00840c 100755
--- a/bin/mw-phpunit.sh
+++ b/bin/mw-phpunit.sh
@@ -37,6 +37,5 @@
$PHP_BIN phpunit.php \
--with-phpunitdir "$PHPUNIT_DIR" \
- --conf "$MW_INSTALL_PATH/LocalSettings.php" \
--log-junit $JUNIT_DEST \
"${phpunit_args[@]:-}"
--
To view, visit https://gerrit.wikimedia.org/r/270504
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I95d5f3d9b954beed9d30445fc933ae3bc900350e
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins
Gerrit-Branch: master
Gerrit-Owner: Krinkle <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
