projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/master' into credentials
[oweals/gnunet.git]
/
src
/
gns
/
test_gns_soa_lookup.sh
diff --git
a/src/gns/test_gns_soa_lookup.sh
b/src/gns/test_gns_soa_lookup.sh
index 272aa74423bf157b3d0fdd64c56f79aeeff55f82..bd8adcb63dfaa67555642bdc58e0f5f3f2a7045c 100755
(executable)
--- a/
src/gns/test_gns_soa_lookup.sh
+++ b/
src/gns/test_gns_soa_lookup.sh
@@
-4,11
+4,18
@@
trap "gnunet-arm -e -c test_gns_lookup.conf" SIGINT
LOCATION=$(which gnunet-config)
if [ -z $LOCATION ]
then
LOCATION=$(which gnunet-config)
if [ -z $LOCATION ]
then
- echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX"
- exit 1
+ 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
fi
-rm -r `gnunet-config -c test_gns_lookup.conf -s PATHS -o GNUNET_HOME -f`
+which timeout &> /dev/null && DO_TIMEOUT="timeout 5"
+
+rm -rf /tmp/test-gnunet-gns-peer-1/
TEST_DOMAIN="homepage.gnu"
# some public DNS resolver we can use
TEST_IP_GNS2DNS="184.172.157.218"
TEST_DOMAIN="homepage.gnu"
# some public DNS resolver we can use
TEST_IP_GNS2DNS="184.172.157.218"
@@
-18,16
+25,17
@@
TEST_RECORD_GNS2DNS="gnunet.org"
if ! nslookup $TEST_RECORD_GNS2DNS $TEST_IP_GNS2DNS &> /dev/null
then
echo "Cannot reach DNS, skipping test"
if ! nslookup $TEST_RECORD_GNS2DNS $TEST_IP_GNS2DNS &> /dev/null
then
echo "Cannot reach DNS, skipping test"
- exit
0
+ exit
77
fi
gnunet-arm -s -c test_gns_lookup.conf
gnunet-identity -C testego -c test_gns_lookup.conf
gnunet-namestore -p -z testego -a -n $TEST_RECORD_NAME -t GNS2DNS -V ${TEST_RECORD_GNS2DNS}@${TEST_IP_GNS2DNS} -e never -c test_gns_lookup.conf
fi
gnunet-arm -s -c test_gns_lookup.conf
gnunet-identity -C testego -c test_gns_lookup.conf
gnunet-namestore -p -z testego -a -n $TEST_RECORD_NAME -t GNS2DNS -V ${TEST_RECORD_GNS2DNS}@${TEST_IP_GNS2DNS} -e never -c test_gns_lookup.conf
-RES_SOA=
$(timeout 5 gnunet-gns --raw -z testego -u $TEST_DOMAIN -t SOA -c test_gns_lookup.conf)
+RES_SOA=
`$DO_TIMEOUT gnunet-gns --raw -z testego -u $TEST_DOMAIN -t SOA -c test_gns_lookup.conf`
gnunet-namestore -z testego -d -n $TEST_RECORD_NAME -t GNS2DNS -V ${TEST_RECORD_GNS2DNS}@${TEST_IP_GNS2DNS} -e never -c test_gns_lookup.conf &> /dev/null
gnunet-identity -D testego -c test_gns_lookup.conf
gnunet-arm -e -c test_gns_lookup.conf
gnunet-namestore -z testego -d -n $TEST_RECORD_NAME -t GNS2DNS -V ${TEST_RECORD_GNS2DNS}@${TEST_IP_GNS2DNS} -e never -c test_gns_lookup.conf &> /dev/null
gnunet-identity -D testego -c test_gns_lookup.conf
gnunet-arm -e -c test_gns_lookup.conf
+rm -rf /tmp/test-gnunet-gns-peer-1/
if [ "x$RES_SOA" != "x" ]
then
if [ "x$RES_SOA" != "x" ]
then