Smallers steps to keep plugin running

[oweals/gnunet.git] / src / arm / test_gnunet_arm.sh

diff --git a/src/arm/test_gnunet_arm.sh b/src/arm/test_gnunet_arm.sh
index d03977f7b8e1d6d86f12a7e7588c57ccc1dfac1e..d36c2ca38180271337c30d28650e1a376a2d8946 100755 (executable)
--- a/src/arm/test_gnunet_arm.sh
+++ b/src/arm/test_gnunet_arm.sh
@@ -1,9 +1,7 @@
 #!/bin/sh
 
-rm -rf /tmp/test-gnunetd-arm/
 exe="./gnunet-arm -c test_arm_api_data.conf"
-base=/tmp/gnunet-test-arm
-out=`mktemp /tmp/test-gnunetd-armXXXXXX.log`
+out=`mktemp /tmp/test-gnunet-arm-logXXXXXXXX`
 #DEBUG="-L DEBUG"
 
 
@@ -17,7 +15,7 @@ fi
 echo "PASS"
 
 # ----------------------------------------------------------------------------------
-echo -n "TEST: Start ARM... "
+echo -n "TEST: Start ARM..."
 
 if ! $exe $DEBUG -s > $out ; then
   echo "FAIL: error running $exe"
@@ -43,21 +41,21 @@ echo "PASS"
 
 # ----------------------------------------------------------------------------------
 echo -n "TEST: Test -t on running service... "
-if ! $exe $DEBUG -t resolver > $base.out; then
+if ! $exe $DEBUG -t resolver > $out; then
     echo "FAIL: error running $exe"
     exit 1
 fi
-LINES=`cat $base.out | grep resolver | grep not | wc -l`
+LINES=`cat $out | grep resolver | grep not | wc -l`
 if test $LINES -ne 0; then
   echo "FAIL: unexpected output:"
-  cat $base.out
+  cat $out
   $exe -e
   exit 1
 fi
-LINES=`cat $base.out | grep resolver | grep -v not | wc -l`
+LINES=`cat $out | grep resolver | grep -v not | wc -l`
 if test $LINES -ne 1; then
   echo "FAIL: unexpected output"
-  cat $base.out
+  cat $out
   $exe -e
   exit 1
 fi
@@ -76,16 +74,16 @@ echo "PASS"
 
 # ----------------------------------------------------------------------------------
 echo -n "TEST: Test -t on stopped service... "
-if ! $exe $DEBUG -t resolver > $base.out; then
+if ! $exe $DEBUG -t resolver > $out; then
   echo "FAIL: error running $exe"
-  cat $base.out
+  cat $out
   $exe -e > /dev/null
   exit 1
 fi
-LINES=`cat $base.out | grep resolver | grep not | wc -l`
+LINES=`cat $out | grep resolver | grep not | wc -l`
 if test $LINES -ne 1; then
   echo "FAIL: unexpected output"
-  cat $base.out 
+  cat $out 
   $exe -e > /dev/null
   exit 1
 fi
@@ -102,5 +100,5 @@ sleep 1
 echo "PASS"
 
 rm -rf /tmp/test-gnunetd-arm/
-rm -f $base.out "$out"
+rm -f $out