[GNUnet-SVN] r31595 - gnunet/src/gns

[gnunet]

Author: grothoff
Date: 2013-12-20 11:01:59 +0100 (Fri, 20 Dec 2013)
New Revision: 31595

Modified:
   gnunet/src/gns/test_gns_gns2dns_lookup.sh
   gnunet/src/gns/test_gns_soa_lookup.sh
Log:
-check for 'timeout'

Modified: gnunet/src/gns/test_gns_gns2dns_lookup.sh
===================================================================
--- gnunet/src/gns/test_gns_gns2dns_lookup.sh   2013-12-20 08:00:23 UTC (rev 
31594)
+++ gnunet/src/gns/test_gns_gns2dns_lookup.sh   2013-12-20 10:01:59 UTC (rev 
31595)
@@ -50,14 +50,16 @@
 # map 'homepage.gnu' to 'gnunet.org' in DNS
 gnunet-namestore -p -z testego -a -n $TEST_RECORD_NAME -t GNS2DNS -V 
$TEST_RECORD_GNS2DNS -e never -c test_gns_lookup.conf
 
+which timeout &> /dev/null && DO_TIMEOUT="timeout 5"
+
 # lookup 'www.gnunet.org', IPv4
-RES_IP=$(timeout 5 gnunet-gns --raw -z testego -u $TEST_DOMAIN -t A -c 
test_gns_lookup.conf)
+RES_IP=`$DO_TIMEOUT gnunet-gns --raw -z testego -u $TEST_DOMAIN -t A -c 
test_gns_lookup.conf`
 # lookup 'www.gnunet.org', IPv6
-RES_IP6=$(timeout 5 gnunet-gns --raw -z testego -u $TEST_DOMAIN -t AAAA -c 
test_gns_lookup.conf)
+RES_IP6=`$DO_TIMEOUT gnunet-gns --raw -z testego -u $TEST_DOMAIN -t AAAA -c 
test_gns_lookup.conf`
 # lookup 'gnunet.org', IPv4
-RES_IP_ALT=$(timeout 5 gnunet-gns --raw -z testego -u $TEST_DOMAIN_ALT -t A -c 
test_gns_lookup.conf)
+RES_IP_ALT=`$DO_TIMEOUT gnunet-gns --raw -z testego -u $TEST_DOMAIN_ALT -t A 
-c test_gns_lookup.conf`
 # lookup 'uk.gnunet.org', IPv4
-RES_IP_ALT2=$(timeout 5 gnunet-gns --raw -z testego -u $TEST_DOMAIN_ALT2 -t A 
-c test_gns_lookup.conf)
+RES_IP_ALT2=`$DO_TIMEOUT gnunet-gns --raw -z testego -u $TEST_DOMAIN_ALT2 -t A 
-c test_gns_lookup.conf`
 
 # clean up
 gnunet-namestore -z testego -d -n $TEST_RESOLVER_LABEL -t A -V 
$TEST_IP_GNS2DNS -e never -c test_gns_lookup.conf

Modified: gnunet/src/gns/test_gns_soa_lookup.sh
===================================================================
--- gnunet/src/gns/test_gns_soa_lookup.sh       2013-12-20 08:00:23 UTC (rev 
31594)
+++ gnunet/src/gns/test_gns_soa_lookup.sh       2013-12-20 10:01:59 UTC (rev 
31595)
@@ -13,6 +13,8 @@
        exit 77
 fi
 
+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
@@ -29,7 +31,7 @@
 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 
address@hidden -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 
address@hidden -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