Adjustments to the checking for behat tests

Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>

jenkins/mahara_jenkins.sh

@@ -43,14 +43,12 @@ done <<< "$the_list"
 echo ""
 echo "########## Check the patch contains a Behat test"
 echo ""
-git diff-tree --no-commit-id --name-only -r HEAD | grep $BEHATTESTREGEX > /dev/null
-if [ $? = 0 ]; then
+if [ "$(git diff-tree --no-commit-id --name-only -r HEAD | grep -c $BEHATTESTREGEX)" -ge 1 ]; then
     echo "Patch includes a Behat test."
 else
     echo "This patch does not include a Behat test!"
     # Check whether the commit message has "behatnotneeded" in it.
-    git log -1 | grep -i $BEHATNOTNEEDED > /dev/null
-    if [ $? = 0 ]; then
+    if [ "$(git log -1 | grep -i -c $BEHATNOTNEEDED)" -ge 1 ]; then
         echo "... but the patch is marked with \"$BEHATNOTNEEDED\", so we will continue."
     else
         echo "Please write a Behat test for it, or, if it cannot be tested, put \"$BEHATNOTNEEDED\" in its commit message."