Merge pull request #467 from totten/master-dr-phpu

civi-test-run - Use phpunit5 for both Civi{Drupal,WP} suites
civicrm · Aug 21, 2019 · f95e646 · f95e646
2 parents e0ad228 + 380a7d3
commit f95e646
Showing 1 changed file with 3 additions and 2 deletions.
diff --git 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\""