Merge pull request #58 from jtpalmer/use-composer-phpunit

Ensure use of PHPUnit installed by composer
ubccr · Feb 17, 2017 · 35f0c9a · 35f0c9a
2 parents 86ee68a + bfb4f33
commit 35f0c9a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/classes/UnitTesting/RunTests.sh b/classes/UnitTesting/RunTests.sh
@@ -14,4 +14,11 @@ then
 fi
 
 cd $(dirname $0)
-phpunit ${PHPUNITARGS} .
+phpunit="$(readlink -f ../../vendor/bin/phpunit)"
+
+if [ ! -x "$phpunit" ]; then
+    echo phpunit not found, run \"composer install\" 1>&2
+    exit 127
+fi
+
+$phpunit ${PHPUNITARGS} .
diff --git a/open_xdmod/modules/xdmod/tests/runtests.sh b/open_xdmod/modules/xdmod/tests/runtests.sh
@@ -1,10 +1,12 @@
 #!/bin/sh
 
-if { ! which phpunit >/dev/null 2>&1; } then
-    echo phpunit not found 1>&2
+cd $(dirname $0)
+phpunit="$(readlink -f ../../../../vendor/bin/phpunit)"
+
+if [ ! -x "$phpunit" ]; then
+    echo phpunit not found, run \"composer install\" 1>&2
     exit 127
 fi
 
-cd $(dirname $0)
-phpunit .
+$phpunit .
 exit $?