diff options
author | Christian Grothoff <christian@grothoff.org> | 2013-09-26 08:52:43 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2013-09-26 08:52:43 +0000 |
commit | 02e344b557bfb88630df2c6d04f028c602f0f009 (patch) | |
tree | 384e7c7ca0671623d71b23171cdf3a01920e7a6c /src/gns/test_gns_delegated_lookup.sh | |
parent | 626c2c8db33bfd00ed7d567a6e58182ca126df37 (diff) | |
download | gnunet-02e344b557bfb88630df2c6d04f028c602f0f009.tar.gz gnunet-02e344b557bfb88630df2c6d04f028c602f0f009.zip |
-check if timeout command exists before using it
Diffstat (limited to 'src/gns/test_gns_delegated_lookup.sh')
-rwxr-xr-x | src/gns/test_gns_delegated_lookup.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gns/test_gns_delegated_lookup.sh b/src/gns/test_gns_delegated_lookup.sh index 570c3d212..83710d28b 100755 --- a/src/gns/test_gns_delegated_lookup.sh +++ b/src/gns/test_gns_delegated_lookup.sh | |||
@@ -1,5 +1,6 @@ | |||
1 | #!/bin/bash | 1 | #!/bin/bash |
2 | trap "gnunet-arm -e -c test_gns_lookup.conf" SIGINT | 2 | trap "gnunet-arm -e -c test_gns_lookup.conf" SIGINT |
3 | which timeout &> /dev/null && DO_TIMEOUT="timeout 5" | ||
3 | 4 | ||
4 | TEST_IP="127.0.0.1" | 5 | TEST_IP="127.0.0.1" |
5 | gnunet-arm -s -c test_gns_lookup.conf | 6 | gnunet-arm -s -c test_gns_lookup.conf |
@@ -8,7 +9,7 @@ DELEGATED_PKEY=$(gnunet-identity -d -c test_gns_lookup.conf | grep delegatedego | |||
8 | gnunet-identity -C testego -c test_gns_lookup.conf | 9 | gnunet-identity -C testego -c test_gns_lookup.conf |
9 | gnunet-namestore -p -z testego -a -n b -t PKEY -V $DELEGATED_PKEY -e never -c test_gns_lookup.conf | 10 | gnunet-namestore -p -z testego -a -n b -t PKEY -V $DELEGATED_PKEY -e never -c test_gns_lookup.conf |
10 | gnunet-namestore -p -z delegatedego -a -n www -t A -V $TEST_IP -e never -c test_gns_lookup.conf | 11 | gnunet-namestore -p -z delegatedego -a -n www -t A -V $TEST_IP -e never -c test_gns_lookup.conf |
11 | RES_IP=$(timeout 5 gnunet-gns --raw -z testego -u www.b.gnu -t A -c test_gns_lookup.conf) | 12 | RES_IP=`$DO_TIMEOUT gnunet-gns --raw -z testego -u www.b.gnu -t A -c test_gns_lookup.conf` |
12 | gnunet-namestore -z testego -d -n b -t PKEY -V $DELEGATED_PKEY -e never -c test_gns_lookup.conf | 13 | gnunet-namestore -z testego -d -n b -t PKEY -V $DELEGATED_PKEY -e never -c test_gns_lookup.conf |
13 | gnunet-namestore -z delegatedego -d -n www -t A -V $TEST_IP -e never -c test_gns_lookup.conf | 14 | gnunet-namestore -z delegatedego -d -n www -t A -V $TEST_IP -e never -c test_gns_lookup.conf |
14 | gnunet-arm -e -c test_gns_lookup.conf | 15 | gnunet-arm -e -c test_gns_lookup.conf |