X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Farm%2Ftest_gnunet_arm.sh;h=4a5b7266dbed9e1365f29177fae6d62d203d9f8b;hb=5a943624e2634d632ee2bf3a78c25b0aeae3813e;hp=00c31a57376ff10b1d378dbac490fdee8b217b1a;hpb=9b8bd69a86700ede757a4a103be076b94806977b;p=oweals%2Fgnunet.git

diff --git a/src/arm/test_gnunet_arm.sh b/src/arm/test_gnunet_arm.sh
index 00c31a573..4a5b7266d 100755
--- 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=/tmp/test-gnunetd-arm.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"
@@ -41,28 +39,6 @@ fi
 sleep 1
 echo "PASS"
 
-# ----------------------------------------------------------------------------------
-echo -n "TEST: Test -t on running service... "
-if ! $exe $DEBUG -t resolver > $base.out; then
-    echo "FAIL: error running $exe"
-    exit 1
-fi
-LINES=`cat $base.out | grep resolver | grep not | wc -l`
-if test $LINES -ne 0; then
-  echo "FAIL: unexpected output:"
-  cat $base.out
-  $exe -e
-  exit 1
-fi
-LINES=`cat $base.out | grep resolver | grep -v not | wc -l`
-if test $LINES -ne 1; then
-  echo "FAIL: unexpected output"
-  cat $base.out
-  $exe -e
-  exit 1
-fi
-echo "PASS"
-
 # ----------------------------------------------------------------------------------
 echo -n "TEST: Stop a service... "
 
@@ -74,23 +50,6 @@ fi
 sleep 1
 echo "PASS"
 
-# ----------------------------------------------------------------------------------
-echo -n "TEST: Test -t on stopped service... "
-if ! $exe $DEBUG -t resolver > $base.out; then
-  echo "FAIL: error running $exe"
-  cat $base.out
-  $exe -e > /dev/null
-  exit 1
-fi
-LINES=`cat $base.out | grep resolver | grep not | wc -l`
-if test $LINES -ne 1; then
-  echo "FAIL: unexpected output"
-  cat $base.out 
-  $exe -e > /dev/null
-  exit 1
-fi
-echo "PASS"
-
 # ----------------------------------------------------------------------------------
 echo -n "TEST: Stop ARM... "
 
@@ -102,5 +61,5 @@ sleep 1
 echo "PASS"
 
 rm -rf /tmp/test-gnunetd-arm/
-rm -f $base.out $out
+rm -f $out