Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

civi-test-run - Use phpunit5 for both Civi{Drupal,WP} suites #467

Merged
merged 1 commit into from
Aug 21, 2019
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions bin/civi-test-run
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#!/bin/bash
set -e
PHPUNIT=phpunit5

#################################################
## Helpers
Expand Down Expand Up @@ -105,7 +106,7 @@ function junit_cleanup() {

function task_phpunit_drupal() {
$GUARD pushd "$CIVI_CORE/drupal"
if ! $GUARD phpunit4 --tap --log-junit "$JUNITDIR/phpunit_drupal.xml" $EXCLUDE_GROUP ; then
if ! $GUARD $PHPUNIT --tap --log-junit "$JUNITDIR/phpunit_drupal.xml" $EXCLUDE_GROUP ; then
EXITCODES="$EXITCODES phpunit-drupal"
fi
echo "Found EXITCODES=\"$EXITCODES\""
Expand All @@ -116,7 +117,7 @@ function task_phpunit_drupal() {

function task_phpunit_wordpress() {
$GUARD pushd "$CIVI_CORE/.."
if ! $GUARD phpunit5 --tap --log-junit "$JUNITDIR/phpunit_wordpress.xml" $EXCLUDE_GROUP ; then
if ! $GUARD $PHPUNIT --tap --log-junit "$JUNITDIR/phpunit_wordpress.xml" $EXCLUDE_GROUP ; then
EXITCODES="$EXITCODES phpunit-wordpress"
fi
echo "Found EXITCODES=\"$EXITCODES\""
Expand Down