Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/270515
Change subject: mw-phpunit: Remove default value for PHPUNIT_DIR
......................................................................
mw-phpunit: Remove default value for PHPUNIT_DIR
This requires the MediaWiki install to have a vendor directory
that includes dev packages such as phpunit.
The override is still supported, however.
Change-Id: I038056178e4a6bc25158a1d1c18eb03a27294948
---
M bin/mw-phpunit.sh
1 file changed, 4 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/jenkins
refs/changes/15/270515/1
diff --git a/bin/mw-phpunit.sh b/bin/mw-phpunit.sh
index d00840c..ee42100 100755
--- a/bin/mw-phpunit.sh
+++ b/bin/mw-phpunit.sh
@@ -12,14 +12,17 @@
. /srv/deployment/integration/slave-scripts/bin/mw-set-env.sh
-PHPUNIT_DIR=${PHPUNIT_DIR:-/srv/deployment/integration/phpunit/vendor/phpunit/phpunit}
JUNIT_DEST="$LOG_DIR/junit-mw-phpunit.xml"
+PHPUNIT_DIR=${PHPUNIT_DIR:-}
PHPUNIT_GROUP=${PHPUNIT_GROUP:-}
PHPUNIT_EXCLUDE_GROUP=${PHPUNIT_EXCLUDE_GROUP:-}
PHPUNIT_TESTSUITE=${PHPUNIT_TESTSUITE:-}
phpunit_args=()
+
+[[ "$PHPUNIT_DIR" ]] && phpunit_args+=('--with-phpunitdir ' "${PHPUNIT_DIR}")
+
[[ "$PHPUNIT_GROUP" ]] && phpunit_args+=('--group' "${PHPUNIT_GROUP}")
# Always exclude some groups:
@@ -36,6 +39,5 @@
cd "${MW_INSTALL_PATH}/tests/phpunit"
$PHP_BIN phpunit.php \
- --with-phpunitdir "$PHPUNIT_DIR" \
--log-junit $JUNIT_DEST \
"${phpunit_args[@]:-}"
--
To view, visit https://gerrit.wikimedia.org/r/270515
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I038056178e4a6bc25158a1d1c18eb03a27294948
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins
Gerrit-Branch: master
Gerrit-Owner: Krinkle <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
