ctdb-tests: Generalise pattern for matching valgrind memcheck executable

On my laptop this is "memcheck-amd64-linux instead of just "memcheck".

Alternatively, this part of the test could simply be skipped if
$VALGRIND is set.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>

diff --git a/ctdb/tests/simple/06_ctdb_getpid.sh b/ctdb/tests/simple/06_ctdb_getpid.sh
index 5dae0c1f295d4d99f93370ce8f8357da0b32df05..48540d052b2a77a9bb2998c7ec7fbaa07575bbf3 100755 (executable)
--- a/ctdb/tests/simple/06_ctdb_getpid.sh
+++ b/ctdb/tests/simple/06_ctdb_getpid.sh
@@ -61,13 +61,17 @@ while [ $n -lt $num_nodes ] ; do
     read pid
     try_command_on_node $n "ls -l /proc/${pid}/exe | sed -e 's@.*/@@'"
     echo -n "Node ${n}, PID ${pid} looks to be running \"$out\" - "
-    if [ "$out" = "ctdbd" ] ; then
-       echo "GOOD!"
-    elif [ -n "$VALGRIND" -a "$out" = "memcheck" ] ; then
-       # We could check cmdline too if this isn't good enough.
-       echo "GOOD enough!"
-    else
-       die "BAD!"
-    fi
+    case "$out" in
+    ctdbd) : ;;
+    memcheck*)
+           if [ -z "$VALGRIND" ] ; then
+                   die "BAD"
+           fi
+           ;;
+    *) die "BAD"
+    esac
+
+    echo "GOOD!"
+
     n=$(($n + 1))
 done <<<"$pids_onnode"