From 380a7d319816c569f248713b34758d1f143608f2 Mon Sep 17 00:00:00 2001 From: Tim Otten Date: Tue, 20 Aug 2019 14:20:28 -0700 Subject: [PATCH] civi-test-run - Use phpunit5 for both Civi{Drupal,WP} suites --- bin/civi-test-run | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/bin/civi-test-run b/bin/civi-test-run index 59c3ffcb..6abb6420 100755 --- a/bin/civi-test-run +++ b/bin/civi-test-run @@ -1,5 +1,6 @@ #!/bin/bash set -e +PHPUNIT=phpunit5 ################################################# ## Helpers @@ -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\"" @@ -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\""