From bfb4f33b3ceb934b577e2e625276042011bd2bca Mon Sep 17 00:00:00 2001
From: "Jeffrey T. Palmer" <jtpalmer@buffalo.edu>
Date: Mon, 13 Feb 2017 14:47:51 -0500
Subject: [PATCH] Use PHPUnit installed by composer

---
 classes/UnitTesting/RunTests.sh            |  9 ++++++++-
 open_xdmod/modules/xdmod/tests/runtests.sh | 10 ++++++----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/classes/UnitTesting/RunTests.sh b/classes/UnitTesting/RunTests.sh
index 57cb0b46bd..ab5f88733e 100755
--- 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
index 4307564d18..31a7f706cc 100755
--- 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 $?