Merge branch 'credentials' of git+ssh://gnunet.org/gnunet into credentials

[oweals/gnunet.git] / src / gns / test_gns_lookup.sh

diff --git a/src/gns/test_gns_lookup.sh b/src/gns/test_gns_lookup.sh
old mode 100644 (file)
new mode 100755 (executable)
index b15c114..ddee5b7
--- a/src/gns/test_gns_lookup.sh
+++ b/src/gns/test_gns_lookup.sh
@@ -1,22 +1,33 @@
 #!/bin/bash
+trap "gnunet-arm -e -c test_gns_lookup.conf" SIGINT
 
-TEST_IP="127.0.0.1"
+LOCATION=$(which gnunet-config)
+if [ -z $LOCATION ]
+then
+  LOCATION="gnunet-config"
+fi
+$LOCATION --version 1> /dev/null
+if test $? != 0
+then
+       echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX"
+       exit 77
+fi
 
+rm -rf `gnunet-config -c test_gns_lookup.conf -s PATHS -o GNUNET_HOME -f`
+which timeout &> /dev/null && DO_TIMEOUT="timeout 30"
+TEST_IP="127.0.0.1"
 gnunet-arm -s -c test_gns_lookup.conf
-
-#gnunet-identity -C testego -c test_gns_lookup.conf
-
+gnunet-identity -C testego -c test_gns_lookup.conf
 gnunet-namestore -p -z testego -a -n www -t A -V $TEST_IP -e never -c test_gns_lookup.conf
-RES_IP=$(gnunet-gns --raw -z testego -u www.gnu -t A -c test_gns_lookup.conf)
-
+RES_IP=`$DO_TIMEOUT gnunet-gns --raw -z testego -u www.gnu -t A -c test_gns_lookup.conf`
 gnunet-namestore -z testego -d -n www -t A -V $TEST_IP -e never -c test_gns_lookup.conf
-
+gnunet-identity -D testego -c test_gns_lookup.conf
 gnunet-arm -e -c test_gns_lookup.conf
 
 if [ "$RES_IP" == "$TEST_IP" ]
 then
   exit 0
 else
+  echo "FAIL: Failed to resolve to proper IP, got $RES_IP."
   exit 1
 fi
-