Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/270653
Change subject: Remove unused mw-run-phpunit.sh script
......................................................................
Remove unused mw-run-phpunit.sh script
All jobs use mw-phpunit.sh, mw-run-phpunit-allexts.sh or one of the others.
Change-Id: I8334fb5faa4b35691cc3194bb5aabb134ae3b576
---
M bin/mw-run-phpunit-allexts.sh
D bin/mw-run-phpunit.sh
2 files changed, 10 insertions(+), 91 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/jenkins
refs/changes/53/270653/1
diff --git a/bin/mw-run-phpunit-allexts.sh b/bin/mw-run-phpunit-allexts.sh
index 036bc35..44f8347 100755
--- a/bin/mw-run-phpunit-allexts.sh
+++ b/bin/mw-run-phpunit-allexts.sh
@@ -11,7 +11,16 @@
JUNIT_DEST="$LOG_DIR/junit-phpunit-allexts.xml"
-# See documentation in mw-run-phpunit.sh
+# Path to PHPUnit as deployed by Wikimedia deployment system.
+#
+# The path is passed to MediaWiki php wrapper using --with-phpunitdir. It
+# should match a local checkout of integration/phpunit.git repository which
+# contains PHPUnit as it is installed by Composer. The local copy should be
+# deployed on all slaves via the role::ci::slave puppet class includes:
+# deployment::target { # 'contint-production-slaves': }
+#
+#
+# WARNING: don't forget to update mw-run-phpunit-allexts.sh as well
PHPUNIT_DIR=${PHPUNIT_DIR:-/srv/deployment/integration/phpunit/vendor/phpunit/phpunit}
# We have to move to the tests/phpunit directory where suite.xml is located or
diff --git a/bin/mw-run-phpunit.sh b/bin/mw-run-phpunit.sh
deleted file mode 100755
index 3a858f8..0000000
--- a/bin/mw-run-phpunit.sh
+++ /dev/null
@@ -1,90 +0,0 @@
-#!/bin/bash -e
-
-# Runs a MediaWiki PHPUnit group
-#
-# By default it will run all tests besides the one listed in
-# PHPUNIT_EXCLUDE_GROUP.
-#
-# Passing 'databaseless' or 'misc' will run buildin list of tests
-
-#######################################################################
-# Configuration
-#######################################################################
-
-. /srv/deployment/integration/slave-scripts/bin/mw-set-env.sh
-
-# MediaWiki known PHPUnit groups
-PHPUNIT_GROUPS="API,Database,Dump,Parser"
-
-# Always exclude some groups:
-# - Broken : tests explicitly marked as non working
-# - ParserFuzz : keep running, mostly for dev/ spotting bugs
-# - Stub : not implemented tests
-PHPUNIT_EXCLUDE_GROUP="Broken,ParserFuzz,Stub"
-
-# Path to PHPUnit as deployed by Wikimedia deployment system.
-#
-# The path is passed to MediaWiki php wrapper using --with-phpunitdir. It
-# should match a local checkout of integration/phpunit.git repository which
-# contains PHPUnit as it is installed by Composer. The local copy should be
-# deployed on all slaves via the role::ci::slave puppet class includes:
-# deployment::target { # 'contint-production-slaves': }
-#
-#
-# WARNING: don't forget to update mw-run-phpunit-allexts.sh as well
-#
-PHPUNIT_DIR=${PHPUNIT_DIR:-/srv/deployment/integration/phpunit/vendor/phpunit/phpunit}
-
-# Setup Junit destination
-JUNIT_DEST="$LOG_DIR/junit-mw-phpunit.xml"
-
-#######################################################################
-# Start of code
-#######################################################################
-
-PHPUNIT_GROUPS_TO_RUN=""
-
-# FIXME: this is all hardcoded :-(
-
-if [ $# -eq 0 ]; then
- echo "No argument given, Will run all tests."
- PHPUNIT_GROUPS_TO_RUN=""
-
-elif [ "$1" == "api" ]; then
- PHPUNIT_GROUPS_TO_RUN="API"
-
-elif [ "$1" == "databaseless" ]; then
- PHPUNIT_EXCLUDE_GROUP="Database,$PHPUNIT_EXCLUDE_GROUP"
-
-elif [ "$1" == "misc" ]; then
- PHPUNIT_GROUPS_TO_RUN="Database"
- # Exclude all known groups but the Database one since we want to run it
-
PHPUNIT_EXCLUDE_GROUP="${PHPUNIT_GROUPS/'Database,'/},$PHPUNIT_EXCLUDE_GROUP"
-
-elif [ "$1" == "parser" ]; then
- PHPUNIT_GROUPS_TO_RUN="Parser"
-
-else
- PHPUNIT_GROUPS_TO_RUN=$(IFS=, eval 'echo "$*"')
-fi
-
-echo "
-PHPUnit groups: $PHPUNIT_GROUPS_TO_RUN
-Excluded groups: $PHPUNIT_EXCLUDE_GROUP
-
-Will log to $JUNIT_DEST
-"
-
-PHPUNIT_GROUP_OPT=""
-if [ "$PHPUNIT_GROUPS_TO_RUN" != "" ]; then
- PHPUNIT_GROUP_OPT="--group $PHPUNIT_GROUPS_TO_RUN"
-fi
-
-set -x
-cd "${MW_INSTALL_PATH}/tests/phpunit"
-$PHP_BIN phpunit.php \
- --with-phpunitdir "$PHPUNIT_DIR" \
- $PHPUNIT_GROUP_OPT \
- --exclude-group "$PHPUNIT_EXCLUDE_GROUP" \
- --conf "$MW_INSTALL_PATH/LocalSettings.php" \
- --log-junit $JUNIT_DEST
--
To view, visit https://gerrit.wikimedia.org/r/270653
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8334fb5faa4b35691cc3194bb5aabb134ae3b576
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
