better ARM test script

2 files changed, 30 insertions, 5 deletions

diff --git a/src/arm/arm.h b/src/arm/arm.h
index a8f5d0706..2293ec036 100644
--- a/src/arm/arm.h
+++ b/src/arm/arm.h
@@ -27,6 +27,6 @@
 
 #include "gnunet_common.h"
 
-#define DEBUG_ARM GNUNET_YES
+#define DEBUG_ARM GNUNET_NO
 
 #endif
diff --git a/src/arm/test_gnunet_arm.sh b/src/arm/test_gnunet_arm.sh
index 85c9d5ea9..207e03d94 100755
--- a/src/arm/test_gnunet_arm.sh
+++ b/src/arm/test_gnunet_arm.sh
@@ -6,6 +6,21 @@ base=/tmp/gnunet-test-arm
 out=/tmp/test-gnunetd-arm.log
 #DEBUG="-L DEBUG"
 
+# -------------------------------------------
+echo -n "TEST: can this script work?... "
+LINES=`ps -C gnunet-service-arm -o pid= | wc -l`
+if test $LINES -ne 0; then
+  echo "No (arm exists). Exiting early."
+  exit 0
+fi
+LINES=`ps -C gnunet-service-resolver -o pid= | wc -l`
+if test $LINES -ne 0; then
+  echo "No (resolver exists). Exiting early."
+  exit 0
+fi
+echo "Yes."
+
+
 # ----------------------------------------------------------------------------------
 echo -n "TEST: Bad argument checking... "
 
@@ -24,7 +39,7 @@ if ! $exe $DEBUG -s > $out ; then
   cat $out
   exit 1
 fi
-LINES=`ps ax | grep gnunet-service-arm | grep -v grep | wc -l`
+LINES=`ps -u $USER -C gnunet-service-arm -o pid= | wc -l`
 if test $LINES -eq 0; then
   echo "FAIL: found $LINES gnunet-service-arm processes"
   echo "Command output was:"
@@ -44,7 +59,7 @@ if ! $exe $DEBUG -i resolver > $out ; then
   exit 1
 fi
 sleep 1
-LINES=`ps ax | grep gnunet-service-resolver | grep -v grep | wc -l`
+LINES=`ps -C gnunet-service-resolver -o pid= | wc -l`
 if test $LINES -ne 1; then
   echo "FAIL: unexpected output (got $LINES lines, wanted 1)"
   echo "Command output was:"
@@ -86,8 +101,14 @@ if ! $exe $DEBUG -k resolver > $out; then
   exit 1
 fi
 sleep 1
-LINES=`ps ax | grep gnunet-service-resolver | grep -v grep | wc -l`
+LINES=`ps -C gnunet-service-resolver -o pid= | wc -l`
 if test $LINES -ne 0; then
+  sleep 5
+  LINES=`ps -C gnunet-service-resolver -o pid= | wc -l`
+fi
+if test $LINES -ne 0; then
+  sleep 2
+
   echo "FAIL: unexpected output"
   echo "Command output was:"
   cat $out
@@ -122,7 +143,11 @@ if ! $exe $DEBUG -e > $out; then
   exit 1
 fi
 sleep 1
-LINES=`ps ax | grep gnunet-service-arm | grep -v grep | wc -l`
+LINES=`ps -C gnunet-service-arm -o pid= | wc -l`
+if test $LINES -ne 0; then
+  sleep 5
+  LINES=`ps -C gnunet-service-arm -o pid= | wc -l`
+fi
 if test $LINES -ne 0; then
   echo "FAIL: unexpected output, still have $LINES gnunet-service-arm processes"
   echo "Command output was:"