diff options
author | Christian Grothoff <christian@grothoff.org> | 2018-05-10 13:30:58 +0200 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2018-05-10 13:30:58 +0200 |
commit | 5f59decb7b7d40f7b478abbc26d2cf15f1a140ae (patch) | |
tree | c7b571c9fb5da8e2abb0766447e4424f2243aace /src/gns | |
parent | 60b697dc2e61bec2d49c13d4d8855e1506efba9b (diff) | |
download | gnunet-5f59decb7b7d40f7b478abbc26d2cf15f1a140ae.tar.gz gnunet-5f59decb7b7d40f7b478abbc26d2cf15f1a140ae.zip |
fix /tmp removal
Diffstat (limited to 'src/gns')
-rwxr-xr-x | src/gns/test_gns_cname_lookup.sh | 4 | ||||
-rwxr-xr-x | src/gns/test_gns_delegated_lookup.sh | 4 | ||||
-rwxr-xr-x | src/gns/test_gns_dht_lookup.sh | 4 | ||||
-rwxr-xr-x | src/gns/test_gns_gns2dns_lookup.sh | 4 | ||||
-rwxr-xr-x | src/gns/test_gns_ipv6_lookup.sh | 2 | ||||
-rwxr-xr-x | src/gns/test_gns_mx_lookup.sh | 4 | ||||
-rwxr-xr-x | src/gns/test_gns_plus_lookup.sh | 4 | ||||
-rwxr-xr-x | src/gns/test_gns_quickupdate.sh | 4 | ||||
-rwxr-xr-x | src/gns/test_gns_rel_expiration.sh | 4 | ||||
-rwxr-xr-x | src/gns/test_gns_revocation.sh | 4 | ||||
-rwxr-xr-x | src/gns/test_gns_soa_lookup.sh | 4 | ||||
-rwxr-xr-x | src/gns/test_gns_txt_lookup.sh | 4 | ||||
-rwxr-xr-x | src/gns/test_gns_zkey_lookup.sh | 4 |
13 files changed, 25 insertions, 25 deletions
diff --git a/src/gns/test_gns_cname_lookup.sh b/src/gns/test_gns_cname_lookup.sh index d9627850f..00ccd265b 100755 --- a/src/gns/test_gns_cname_lookup.sh +++ b/src/gns/test_gns_cname_lookup.sh | |||
@@ -22,7 +22,7 @@ then | |||
22 | fi | 22 | fi |
23 | 23 | ||
24 | 24 | ||
25 | rm -rf /tmp/test-gnunet-gns-peer-1/ | 25 | rm -rf `gnunet-config -c test_gns_lookup.conf -f -s paths -o GNUNET_TEST_HOME` |
26 | 26 | ||
27 | TEST_IP_PLUS="127.0.0.1" | 27 | TEST_IP_PLUS="127.0.0.1" |
28 | TEST_IP_DNS="131.159.74.67" | 28 | TEST_IP_DNS="131.159.74.67" |
@@ -51,7 +51,7 @@ gnunet-namestore -p -z $MY_EGO -d -n $TEST_RECORD_NAME_PLUS -t CNAME -V $TEST_RE | |||
51 | gnunet-namestore -p -z $MY_EGO -d -n $TEST_RECORD_CNAME_SERVER -t A -V $TEST_IP_PLUS -e never -c test_gns_lookup.conf | 51 | gnunet-namestore -p -z $MY_EGO -d -n $TEST_RECORD_CNAME_SERVER -t A -V $TEST_IP_PLUS -e never -c test_gns_lookup.conf |
52 | gnunet-identity -D $MY_EGO -c test_gns_lookup.conf | 52 | gnunet-identity -D $MY_EGO -c test_gns_lookup.conf |
53 | gnunet-arm -e -c test_gns_lookup.conf | 53 | gnunet-arm -e -c test_gns_lookup.conf |
54 | rm -rf /tmp/test-gnunet-gns-peer-1/ | 54 | rm -rf `gnunet-config -c test_gns_lookup.conf -f -s paths -o GNUNET_TEST_HOME` |
55 | 55 | ||
56 | if [ "$RES_CNAME_RAW" == "server.$TESTEGOZONE" ] | 56 | if [ "$RES_CNAME_RAW" == "server.$TESTEGOZONE" ] |
57 | then | 57 | then |
diff --git a/src/gns/test_gns_delegated_lookup.sh b/src/gns/test_gns_delegated_lookup.sh index edda688ff..3374f1b3b 100755 --- a/src/gns/test_gns_delegated_lookup.sh +++ b/src/gns/test_gns_delegated_lookup.sh | |||
@@ -14,7 +14,7 @@ then | |||
14 | exit 77 | 14 | exit 77 |
15 | fi | 15 | fi |
16 | 16 | ||
17 | rm -rf /tmp/test-gnunet-gns-peer-1/ | 17 | rm -rf `gnunet-config -c test_gns_lookup.conf -f -s paths -o GNUNET_TEST_HOME` |
18 | MY_EGO="myego" | 18 | MY_EGO="myego" |
19 | OTHER_EGO="delegatedego" | 19 | OTHER_EGO="delegatedego" |
20 | FINAL_LABEL="www" | 20 | FINAL_LABEL="www" |
@@ -32,7 +32,7 @@ gnunet-namestore -z $MY_EGO -d -n b -t PKEY -V $DELEGATED_PKEY -e never -c test | |||
32 | gnunet-namestore -z $OTHER_EGO -d -n $FINAL_LABEL -t A -V $TEST_IP -e never -c test_gns_lookup.conf | 32 | gnunet-namestore -z $OTHER_EGO -d -n $FINAL_LABEL -t A -V $TEST_IP -e never -c test_gns_lookup.conf |
33 | gnunet-arm -e -c test_gns_lookup.conf | 33 | gnunet-arm -e -c test_gns_lookup.conf |
34 | 34 | ||
35 | rm -rf /tmp/test-gnunet-gns-peer-1/ | 35 | rm -rf `gnunet-config -c test_gns_lookup.conf -f -s paths -o GNUNET_TEST_HOME` |
36 | 36 | ||
37 | if [ "$RES_IP" == "$TEST_IP" ] | 37 | if [ "$RES_IP" == "$TEST_IP" ] |
38 | then | 38 | then |
diff --git a/src/gns/test_gns_dht_lookup.sh b/src/gns/test_gns_dht_lookup.sh index 365c77339..6c977bb0d 100755 --- a/src/gns/test_gns_dht_lookup.sh +++ b/src/gns/test_gns_dht_lookup.sh | |||
@@ -18,7 +18,7 @@ TEST_IP="127.0.0.1" | |||
18 | MY_EGO="myego" | 18 | MY_EGO="myego" |
19 | OTHER_EGO="delegatedego" | 19 | OTHER_EGO="delegatedego" |
20 | 20 | ||
21 | 21 | rm -rf `gnunet-config -c test_gns_lookup.conf -f -s paths -o GNUNET_TEST_HOME` | |
22 | gnunet-arm -s -c test_gns_lookup.conf | 22 | gnunet-arm -s -c test_gns_lookup.conf |
23 | gnunet-identity -C $OTHER_EGO -c test_gns_lookup.conf | 23 | gnunet-identity -C $OTHER_EGO -c test_gns_lookup.conf |
24 | DELEGATED_PKEY=$(gnunet-identity -d -c test_gns_lookup.conf | grep $OTHER_EGO | awk '{print $3}') | 24 | DELEGATED_PKEY=$(gnunet-identity -d -c test_gns_lookup.conf | grep $OTHER_EGO | awk '{print $3}') |
@@ -31,7 +31,7 @@ gnunet-namestore -z $OTHER_EGO -d -n www -t A -V $TEST_IP -e never -c test_gns_ | |||
31 | RES_IP=`$DO_TIMEOUT gnunet-gns --raw -u www.b.$MY_EGO -t A -c test_gns_lookup.conf` | 31 | RES_IP=`$DO_TIMEOUT gnunet-gns --raw -u www.b.$MY_EGO -t A -c test_gns_lookup.conf` |
32 | gnunet-namestore -z $MY_EGO -d -n b -t PKEY -V $DELEGATED_PKEY -e never -c test_gns_lookup.conf | 32 | gnunet-namestore -z $MY_EGO -d -n b -t PKEY -V $DELEGATED_PKEY -e never -c test_gns_lookup.conf |
33 | gnunet-arm -e -c test_gns_lookup.conf | 33 | gnunet-arm -e -c test_gns_lookup.conf |
34 | rm -rf /tmp/test-gnunet-gns-peer-1/ | 34 | rm -rf `gnunet-config -c test_gns_lookup.conf -f -s paths -o GNUNET_TEST_HOME` |
35 | 35 | ||
36 | if [ "$RES_IP" == "$TEST_IP" ] | 36 | if [ "$RES_IP" == "$TEST_IP" ] |
37 | then | 37 | then |
diff --git a/src/gns/test_gns_gns2dns_lookup.sh b/src/gns/test_gns_gns2dns_lookup.sh index 921d9594d..ad5d762eb 100755 --- a/src/gns/test_gns_gns2dns_lookup.sh +++ b/src/gns/test_gns_gns2dns_lookup.sh | |||
@@ -13,7 +13,7 @@ then | |||
13 | exit 77 | 13 | exit 77 |
14 | fi | 14 | fi |
15 | 15 | ||
16 | rm -r rm -rf /tmp/test-gnunet-gns-peer-1/ | 16 | rm -rf `gnunet-config -c test_gns_lookup.conf -f -s paths -o GNUNET_TEST_HOME` |
17 | # IP address of 'uk.gnunet.org' | 17 | # IP address of 'uk.gnunet.org' |
18 | TEST_IP_ALT2="81.187.252.184" | 18 | TEST_IP_ALT2="81.187.252.184" |
19 | # IP address of 'www.gnunet.org' | 19 | # IP address of 'www.gnunet.org' |
@@ -72,7 +72,7 @@ gnunet-namestore -z $MY_EGO -d -n $TEST_RESOLVER_LABEL -t A -V $TEST_IP_GNS2DNS | |||
72 | gnunet-namestore -z $MY_EGO -d -n $TEST_RECORD_NAME -t GNS2DNS -V $TEST_RECORD_GNS2DNS -e never -c test_gns_lookup.conf | 72 | gnunet-namestore -z $MY_EGO -d -n $TEST_RECORD_NAME -t GNS2DNS -V $TEST_RECORD_GNS2DNS -e never -c test_gns_lookup.conf |
73 | gnunet-identity -D $MY_EGO -c test_gns_lookup.conf | 73 | gnunet-identity -D $MY_EGO -c test_gns_lookup.conf |
74 | gnunet-arm -e -c test_gns_lookup.conf | 74 | gnunet-arm -e -c test_gns_lookup.conf |
75 | rm -rf /tmp/test-gnunet-gns-peer-1/ | 75 | rm -rf `gnunet-config -c test_gns_lookup.conf -f -s paths -o GNUNET_TEST_HOME` |
76 | 76 | ||
77 | ret=0 | 77 | ret=0 |
78 | if [ "$RES_IP" == "$TEST_IP" ] | 78 | if [ "$RES_IP" == "$TEST_IP" ] |
diff --git a/src/gns/test_gns_ipv6_lookup.sh b/src/gns/test_gns_ipv6_lookup.sh index 118c23060..301e6ae0c 100755 --- a/src/gns/test_gns_ipv6_lookup.sh +++ b/src/gns/test_gns_ipv6_lookup.sh | |||
@@ -24,7 +24,7 @@ RES_IP=`$DO_TIMEOUT gnunet-gns --raw -u www.$MY_EGO -t AAAA -c test_gns_lookup.c | |||
24 | gnunet-namestore -z $MY_EGO -d -n www -t AAAA -V $TEST_IP -e never -c test_gns_lookup.conf | 24 | gnunet-namestore -z $MY_EGO -d -n www -t AAAA -V $TEST_IP -e never -c test_gns_lookup.conf |
25 | gnunet-identity -D $MY_EGO -c test_gns_lookup.conf | 25 | gnunet-identity -D $MY_EGO -c test_gns_lookup.conf |
26 | gnunet-arm -e -c test_gns_lookup.conf | 26 | gnunet-arm -e -c test_gns_lookup.conf |
27 | rm -rf /tmp/test-gnunet-gns-peer-1/ | 27 | rm -rf `gnunet-config -c test_gns_lookup.conf -f -s paths -o GNUNET_TEST_HOME` |
28 | 28 | ||
29 | if [ "$RES_IP" == "$TEST_IP" ] | 29 | if [ "$RES_IP" == "$TEST_IP" ] |
30 | then | 30 | then |
diff --git a/src/gns/test_gns_mx_lookup.sh b/src/gns/test_gns_mx_lookup.sh index 8abc9f509..5a7ef21c3 100755 --- a/src/gns/test_gns_mx_lookup.sh +++ b/src/gns/test_gns_mx_lookup.sh | |||
@@ -13,7 +13,7 @@ then | |||
13 | exit 77 | 13 | exit 77 |
14 | fi | 14 | fi |
15 | 15 | ||
16 | rm -rf /tmp/test-gnunet-gns-peer-1/ | 16 | rm -rf `gnunet-config -c test_gns_lookup.conf -f -s paths -o GNUNET_TEST_HOME` |
17 | which timeout &> /dev/null && DO_TIMEOUT="timeout 5" | 17 | which timeout &> /dev/null && DO_TIMEOUT="timeout 5" |
18 | 18 | ||
19 | MY_EGO="myego" | 19 | MY_EGO="myego" |
@@ -28,7 +28,7 @@ RES_MX=`$DO_TIMEOUT gnunet-gns --raw -u www.$MY_EGO -t MX -c test_gns_lookup.con | |||
28 | gnunet-namestore -z $MY_EGO -d -n www -t MX -V "$TEST_MX" -e never -c test_gns_lookup.conf | 28 | gnunet-namestore -z $MY_EGO -d -n www -t MX -V "$TEST_MX" -e never -c test_gns_lookup.conf |
29 | gnunet-identity -D $MY_EGO -c test_gns_lookup.conf | 29 | gnunet-identity -D $MY_EGO -c test_gns_lookup.conf |
30 | gnunet-arm -e -c test_gns_lookup.conf | 30 | gnunet-arm -e -c test_gns_lookup.conf |
31 | rm -rf /tmp/test-gnunet-gns-peer-1/ | 31 | rm -rf `gnunet-config -c test_gns_lookup.conf -f -s paths -o GNUNET_TEST_HOME` |
32 | 32 | ||
33 | if [ "$RES_MX" == "$WANT_MX" ] | 33 | if [ "$RES_MX" == "$WANT_MX" ] |
34 | then | 34 | then |
diff --git a/src/gns/test_gns_plus_lookup.sh b/src/gns/test_gns_plus_lookup.sh index 4cf7a8855..8840b9bcf 100755 --- a/src/gns/test_gns_plus_lookup.sh +++ b/src/gns/test_gns_plus_lookup.sh | |||
@@ -14,7 +14,7 @@ then | |||
14 | fi | 14 | fi |
15 | 15 | ||
16 | which timeout &> /dev/null && DO_TIMEOUT="timeout 5" | 16 | which timeout &> /dev/null && DO_TIMEOUT="timeout 5" |
17 | rm -rf /tmp/test-gnunet-gns-peer-1/ | 17 | rm -rf `gnunet-config -c test_gns_lookup.conf -f -s paths -o GNUNET_TEST_HOME` |
18 | 18 | ||
19 | TEST_IP="127.0.0.1" | 19 | TEST_IP="127.0.0.1" |
20 | MY_EGO="myego" | 20 | MY_EGO="myego" |
@@ -28,7 +28,7 @@ RES_IP=`$DO_TIMEOUT gnunet-gns --raw -u b.$MY_EGO -t A -c test_gns_lookup.conf` | |||
28 | gnunet-namestore -z $MY_EGO -d -n b -t PKEY -V $DELEGATED_PKEY -e never -c test_gns_lookup.conf | 28 | gnunet-namestore -z $MY_EGO -d -n b -t PKEY -V $DELEGATED_PKEY -e never -c test_gns_lookup.conf |
29 | gnunet-namestore -z delegatedego -d -n '+' -t A -V $TEST_IP -e never -c test_gns_lookup.conf | 29 | gnunet-namestore -z delegatedego -d -n '+' -t A -V $TEST_IP -e never -c test_gns_lookup.conf |
30 | gnunet-arm -e -c test_gns_lookup.conf | 30 | gnunet-arm -e -c test_gns_lookup.conf |
31 | rm -rf /tmp/test-gnunet-gns-peer-1/ | 31 | rm -rf `gnunet-config -c test_gns_lookup.conf -f -s paths -o GNUNET_TEST_HOME` |
32 | 32 | ||
33 | if [ "$RES_IP" == "$TEST_IP" ] | 33 | if [ "$RES_IP" == "$TEST_IP" ] |
34 | then | 34 | then |
diff --git a/src/gns/test_gns_quickupdate.sh b/src/gns/test_gns_quickupdate.sh index 5606491e4..e0eb33f2e 100755 --- a/src/gns/test_gns_quickupdate.sh +++ b/src/gns/test_gns_quickupdate.sh | |||
@@ -17,7 +17,7 @@ MY_EGO="myego" | |||
17 | OTHER_EGO="delegatedego" | 17 | OTHER_EGO="delegatedego" |
18 | 18 | ||
19 | 19 | ||
20 | rm -rf /tmp/test-gnunet-gns-peer-1/ | 20 | rm -rf `gnunet-config -c test_gns_lookup.conf -f -s paths -o GNUNET_TEST_HOME` |
21 | which timeout &> /dev/null && DO_TIMEOUT="timeout 5" | 21 | which timeout &> /dev/null && DO_TIMEOUT="timeout 5" |
22 | TEST_IP="127.0.0.1" | 22 | TEST_IP="127.0.0.1" |
23 | gnunet-arm -s -c test_gns_lookup.conf | 23 | gnunet-arm -s -c test_gns_lookup.conf |
@@ -53,7 +53,7 @@ gnunet-namestore -z $MY_EGO -d -n b -t PKEY -V $DELEGATED_PKEY -e never -c test | |||
53 | gnunet-identity -D $MY_EGO -c test_gns_lookup.conf | 53 | gnunet-identity -D $MY_EGO -c test_gns_lookup.conf |
54 | gnunet-identity -D $OTHER_EGO -c test_gns_lookup.conf | 54 | gnunet-identity -D $OTHER_EGO -c test_gns_lookup.conf |
55 | gnunet-arm -e -c test_gns_lookup.conf | 55 | gnunet-arm -e -c test_gns_lookup.conf |
56 | rm -rf /tmp/test-gnunet-gns-peer-1/ | 56 | rm -rf `gnunet-config -c test_gns_lookup.conf -f -s paths -o GNUNET_TEST_HOME` |
57 | 57 | ||
58 | if [ "$RES_IP" == "$TEST_IP" ] | 58 | if [ "$RES_IP" == "$TEST_IP" ] |
59 | then | 59 | then |
diff --git a/src/gns/test_gns_rel_expiration.sh b/src/gns/test_gns_rel_expiration.sh index 992098db3..a266a7484 100755 --- a/src/gns/test_gns_rel_expiration.sh +++ b/src/gns/test_gns_rel_expiration.sh | |||
@@ -16,7 +16,7 @@ fi | |||
16 | MY_EGO="myego" | 16 | MY_EGO="myego" |
17 | OTHER_EGO="delegatedego" | 17 | OTHER_EGO="delegatedego" |
18 | 18 | ||
19 | rm -rf /tmp/test-gnunet-gns-peer-1/ | 19 | rm -rf `gnunet-config -c test_gns_lookup.conf -f -s paths -o GNUNET_TEST_HOME` |
20 | which timeout &> /dev/null && DO_TIMEOUT="timeout 5" | 20 | which timeout &> /dev/null && DO_TIMEOUT="timeout 5" |
21 | TEST_IP="127.0.0.1" | 21 | TEST_IP="127.0.0.1" |
22 | gnunet-arm -s -c test_gns_lookup.conf | 22 | gnunet-arm -s -c test_gns_lookup.conf |
@@ -38,7 +38,7 @@ gnunet-namestore -z $MY_EGO -d -n b -t PKEY -V $DELEGATED_PKEY -e never -c test | |||
38 | gnunet-identity -D $MY_EGO -c test_gns_lookup.conf | 38 | gnunet-identity -D $MY_EGO -c test_gns_lookup.conf |
39 | gnunet-identity -D $OTHER_EGO -c test_gns_lookup.conf | 39 | gnunet-identity -D $OTHER_EGO -c test_gns_lookup.conf |
40 | gnunet-arm -e -c test_gns_lookup.conf | 40 | gnunet-arm -e -c test_gns_lookup.conf |
41 | rm -rf /tmp/test-gnunet-gns-peer-1/ | 41 | rm -rf `gnunet-config -c test_gns_lookup.conf -f -s paths -o GNUNET_TEST_HOME` |
42 | 42 | ||
43 | if [ "$RES_IP_EXP" == "$TEST_IP" ] | 43 | if [ "$RES_IP_EXP" == "$TEST_IP" ] |
44 | then | 44 | then |
diff --git a/src/gns/test_gns_revocation.sh b/src/gns/test_gns_revocation.sh index 269b940d9..12f0c0881 100755 --- a/src/gns/test_gns_revocation.sh +++ b/src/gns/test_gns_revocation.sh | |||
@@ -14,7 +14,7 @@ then | |||
14 | exit 77 | 14 | exit 77 |
15 | fi | 15 | fi |
16 | 16 | ||
17 | rm -rf /tmp/test-gnunet-gns-peer-1/ | 17 | rm -rf `gnunet-config -c test_gns_lookup.conf -f -s paths -o GNUNET_TEST_HOME` |
18 | MY_EGO="myego" | 18 | MY_EGO="myego" |
19 | OTHER_EGO="delegatedego" | 19 | OTHER_EGO="delegatedego" |
20 | TEST_IP="127.0.0.1" | 20 | TEST_IP="127.0.0.1" |
@@ -31,7 +31,7 @@ RES_IP_REV=`$DO_TIMEOUT gnunet-gns --raw -u www.b.$MY_EGO -t A -c test_gns_looku | |||
31 | gnunet-namestore -z $MY_EGO -d -n b -t PKEY -V $DELEGATED_PKEY -e never -c test_gns_lookup.conf | 31 | gnunet-namestore -z $MY_EGO -d -n b -t PKEY -V $DELEGATED_PKEY -e never -c test_gns_lookup.conf |
32 | gnunet-namestore -z $OTHER_EGO -d -n www -t A -V $TEST_IP -e never -c test_gns_lookup.conf | 32 | gnunet-namestore -z $OTHER_EGO -d -n www -t A -V $TEST_IP -e never -c test_gns_lookup.conf |
33 | gnunet-arm -e -c test_gns_lookup.conf | 33 | gnunet-arm -e -c test_gns_lookup.conf |
34 | rm -rf /tmp/test-gnunet-gns-peer-1/ | 34 | rm -rf `gnunet-config -c test_gns_lookup.conf -f -s paths -o GNUNET_TEST_HOME` |
35 | 35 | ||
36 | if [ "$RES_IP" != "$TEST_IP" ] | 36 | if [ "$RES_IP" != "$TEST_IP" ] |
37 | then | 37 | then |
diff --git a/src/gns/test_gns_soa_lookup.sh b/src/gns/test_gns_soa_lookup.sh index 2f9cc58de..82a5885c3 100755 --- a/src/gns/test_gns_soa_lookup.sh +++ b/src/gns/test_gns_soa_lookup.sh | |||
@@ -15,7 +15,7 @@ fi | |||
15 | 15 | ||
16 | which timeout &> /dev/null && DO_TIMEOUT="timeout 5" | 16 | which timeout &> /dev/null && DO_TIMEOUT="timeout 5" |
17 | 17 | ||
18 | rm -rf /tmp/test-gnunet-gns-peer-1/ | 18 | rm -rf `gnunet-config -c test_gns_lookup.conf -f -s paths -o GNUNET_TEST_HOME` |
19 | MY_EGO="myego" | 19 | MY_EGO="myego" |
20 | TEST_DOMAIN="homepage.$MY_EGO" | 20 | TEST_DOMAIN="homepage.$MY_EGO" |
21 | # some public DNS resolver we can use | 21 | # some public DNS resolver we can use |
@@ -36,7 +36,7 @@ RES_SOA=`$DO_TIMEOUT gnunet-gns --raw -u $TEST_DOMAIN -t SOA -c test_gns_lookup. | |||
36 | gnunet-namestore -z $MY_EGO -d -n $TEST_RECORD_NAME -t GNS2DNS -V ${TEST_RECORD_GNS2DNS}@${TEST_IP_GNS2DNS} -e never -c test_gns_lookup.conf &> /dev/null | 36 | gnunet-namestore -z $MY_EGO -d -n $TEST_RECORD_NAME -t GNS2DNS -V ${TEST_RECORD_GNS2DNS}@${TEST_IP_GNS2DNS} -e never -c test_gns_lookup.conf &> /dev/null |
37 | gnunet-identity -D $MY_EGO -c test_gns_lookup.conf | 37 | gnunet-identity -D $MY_EGO -c test_gns_lookup.conf |
38 | gnunet-arm -e -c test_gns_lookup.conf | 38 | gnunet-arm -e -c test_gns_lookup.conf |
39 | rm -rf /tmp/test-gnunet-gns-peer-1/ | 39 | rm -rf `gnunet-config -c test_gns_lookup.conf -f -s paths -o GNUNET_TEST_HOME` |
40 | 40 | ||
41 | if [ "x$RES_SOA" != "x" ] | 41 | if [ "x$RES_SOA" != "x" ] |
42 | then | 42 | then |
diff --git a/src/gns/test_gns_txt_lookup.sh b/src/gns/test_gns_txt_lookup.sh index 68a60c8b6..ce9b9e806 100755 --- a/src/gns/test_gns_txt_lookup.sh +++ b/src/gns/test_gns_txt_lookup.sh | |||
@@ -13,7 +13,7 @@ then | |||
13 | exit 77 | 13 | exit 77 |
14 | fi | 14 | fi |
15 | 15 | ||
16 | rm -rf /tmp/test-gnunet-gns-peer-1/ | 16 | rm -rf `gnunet-config -c test_gns_lookup.conf -f -s paths -o GNUNET_TEST_HOME` |
17 | which timeout &> /dev/null && DO_TIMEOUT="timeout 30" | 17 | which timeout &> /dev/null && DO_TIMEOUT="timeout 30" |
18 | TEST_TXT="GNS powered txt record data" | 18 | TEST_TXT="GNS powered txt record data" |
19 | MY_EGO="myego" | 19 | MY_EGO="myego" |
@@ -25,7 +25,7 @@ RES_TXT=`$DO_TIMEOUT gnunet-gns --raw -u $LABEL.$MY_EGO -t TXT -c test_gns_looku | |||
25 | gnunet-namestore -z $MY_EGO -d -n $LABEL -t TXT -V "$TEST_TXT" -e never -c test_gns_lookup.conf | 25 | gnunet-namestore -z $MY_EGO -d -n $LABEL -t TXT -V "$TEST_TXT" -e never -c test_gns_lookup.conf |
26 | gnunet-identity -D $MY_EGO -c test_gns_lookup.conf | 26 | gnunet-identity -D $MY_EGO -c test_gns_lookup.conf |
27 | gnunet-arm -e -c test_gns_lookup.conf | 27 | gnunet-arm -e -c test_gns_lookup.conf |
28 | rm -rf /tmp/test-gnunet-gns-peer-1/ | 28 | rm -rf `gnunet-config -c test_gns_lookup.conf -f -s paths -o GNUNET_TEST_HOME` |
29 | 29 | ||
30 | if [ "$RES_TXT" == "$TEST_TXT" ] | 30 | if [ "$RES_TXT" == "$TEST_TXT" ] |
31 | then | 31 | then |
diff --git a/src/gns/test_gns_zkey_lookup.sh b/src/gns/test_gns_zkey_lookup.sh index 312198780..5e67e0ce2 100755 --- a/src/gns/test_gns_zkey_lookup.sh +++ b/src/gns/test_gns_zkey_lookup.sh | |||
@@ -14,7 +14,7 @@ then | |||
14 | exit 77 | 14 | exit 77 |
15 | fi | 15 | fi |
16 | 16 | ||
17 | rm -rf /tmp/test-gnunet-gns-peer-1/ | 17 | rm -rf `gnunet-config -c test_gns_lookup.conf -f -s paths -o GNUNET_TEST_HOME` |
18 | 18 | ||
19 | TEST_IP="127.0.0.1" | 19 | TEST_IP="127.0.0.1" |
20 | gnunet-arm -s -c test_gns_lookup.conf | 20 | gnunet-arm -s -c test_gns_lookup.conf |
@@ -27,7 +27,7 @@ RES_IP=`$DO_TIMEOUT gnunet-gns --raw -u www.${DELEGATED_PKEY} -t A -c test_gns_l | |||
27 | gnunet-namestore -z testego -d -n b -t PKEY -V $DELEGATED_PKEY -e never -c test_gns_lookup.conf | 27 | gnunet-namestore -z testego -d -n b -t PKEY -V $DELEGATED_PKEY -e never -c test_gns_lookup.conf |
28 | gnunet-namestore -z delegatedego -d -n www -t A -V $TEST_IP -e never -c test_gns_lookup.conf | 28 | gnunet-namestore -z delegatedego -d -n www -t A -V $TEST_IP -e never -c test_gns_lookup.conf |
29 | gnunet-arm -e -c test_gns_lookup.conf | 29 | gnunet-arm -e -c test_gns_lookup.conf |
30 | rm -rf /tmp/test-gnunet-gns-peer-1/ | 30 | rm -rf `gnunet-config -c test_gns_lookup.conf -f -s paths -o GNUNET_TEST_HOME` |
31 | 31 | ||
32 | if [ "$RES_IP" == "$TEST_IP" ] | 32 | if [ "$RES_IP" == "$TEST_IP" ] |
33 | then | 33 | then |