Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164953
Change subject: mw-run-phpunit*: let us override PHPUNIT_DIR
......................................................................
mw-run-phpunit*: let us override PHPUNIT_DIR
I would like to run MediaWiki PHPUnit job whenever a change is proposed
to our PHPUnit fork in integration/phpunit.git. To do so change the
assignement of PHPUNIT_DIR so it does not override the variable if it is
already set.
Change-Id: I26ff7a52b9ab9fefef5dfb4c07ee65738e3f9868
---
M bin/mw-run-phpunit-allexts.sh
M bin/mw-run-phpunit-hhvm.sh
M bin/mw-run-phpunit.sh
3 files changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/jenkins
refs/changes/53/164953/1
diff --git a/bin/mw-run-phpunit-allexts.sh b/bin/mw-run-phpunit-allexts.sh
index 55f3b05..8c2d45e 100755
--- a/bin/mw-run-phpunit-allexts.sh
+++ b/bin/mw-run-phpunit-allexts.sh
@@ -13,7 +13,7 @@
JUNIT_DEST="$LOG_DIR/junit-phpunit-allexts.xml"
# See documentation in mw-run-phpunit.sh
-PHPUNIT_DIR="/srv/deployment/integration/phpunit/vendor/phpunit/phpunit"
+PHPUNIT_DIR=${PHPUNIT_DIR:-/srv/deployment/integration/phpunit/vendor/phpunit/phpunit}
# Make sure to compress MediaWiki log dir after phpunit has ran
function compress_log_dir() {
diff --git a/bin/mw-run-phpunit-hhvm.sh b/bin/mw-run-phpunit-hhvm.sh
index 4f2cfb6..f608e10 100755
--- a/bin/mw-run-phpunit-hhvm.sh
+++ b/bin/mw-run-phpunit-hhvm.sh
@@ -23,7 +23,7 @@
#
# WARNING: don't forget to update mw-run-phpunit-allexts.sh as well
#
-PHPUNIT_DIR="/srv/deployment/integration/phpunit/vendor/phpunit/phpunit"
+PHPUNIT_DIR=${PHPUNIT_DIR:-/srv/deployment/integration/phpunit/vendor/phpunit/phpunit}
# Setup Junit destination
LOG_DIR="$WORKSPACE/log"
diff --git a/bin/mw-run-phpunit.sh b/bin/mw-run-phpunit.sh
index 60bef01..f6e33fc 100755
--- a/bin/mw-run-phpunit.sh
+++ b/bin/mw-run-phpunit.sh
@@ -32,7 +32,7 @@
#
# WARNING: don't forget to update mw-run-phpunit-allexts.sh as well
#
-PHPUNIT_DIR="/srv/deployment/integration/phpunit/vendor/phpunit/phpunit"
+PHPUNIT_DIR=${PHPUNIT_DIR:-/srv/deployment/integration/phpunit/vendor/phpunit/phpunit}
# Setup Junit destination
LOG_DIR="$WORKSPACE/log"
--
To view, visit https://gerrit.wikimedia.org/r/164953
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I26ff7a52b9ab9fefef5dfb4c07ee65738e3f9868
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins
Gerrit-Branch: master
Gerrit-Owner: Hashar <has...@free.fr>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
