changes to config and test due to test directory

diff --git a/src/gns/test_gns_defaults.conf b/src/gns/test_gns_defaults.conf
index 27024f783ffae1e25da1922c346ef639a2abf7d9..60efa2693e49679a04f91abc1f3659e5dfb8d06b 100644 (file)
--- a/src/gns/test_gns_defaults.conf
+++ b/src/gns/test_gns_defaults.conf
@@ -4,6 +4,9 @@ GNUNET_TEST_HOME = /tmp/test-gnunet-gns-testing/
 [namestore-sqlite]
 FILENAME = $GNUNET_TEST_HOME/namestore/sqlite_test.db
 
+[namecache-sqlite]
+FILENAME=$GNUNET_TEST_HOME/namecache/namecache.db
+
 [identity]
 # Directory where we store information about our egos
 EGODIR = $GNUNET_TEST_HOME/identity/egos/

diff --git a/src/gns/test_gns_lookup.conf b/src/gns/test_gns_lookup.conf
index bf3ac592da3becf7c9d588793d6c6bb9b5d1ab7e..219d82f8acf816baa5ef9788c6b98e2a7bb033ec 100644 (file)
--- a/src/gns/test_gns_lookup.conf
+++ b/src/gns/test_gns_lookup.conf
@@ -1,4 +1,8 @@
 @INLINE@ test_gns_defaults.conf
+
+[PATHS]
+GNUNET_TEST_HOME = /tmp/test-gnunet-gns-peer-1/
+
 [dht]
 AUTOSTART = YES
 
@@ -8,9 +12,6 @@ PLUGINS =
 [arm]
 DEFAULTSERVICES =
 
-[PATHS]
-GNUNET_TEST_HOME = /tmp/test-gnunet-gns-peer-1/
-
 [gns]
 #PREFIX = valgrind --leak-check=full --track-origins=yes
 AUTOSTART = YES
@@ -21,8 +22,5 @@ RECORD_PUT_INTERVAL = 1 h
 ZONE_PUBLISH_TIME_WINDOW = 1 h
 DNS_ROOT=PD67SGHF3E0447TU9HADIVU9OM7V4QHTOG0EBU69TFRI2LG63DR0
 
-[namecache-sqlite]
-FILENAME=/tmp/test-gnunet-gns-peer-1/namecache.db
-
 [revocation]
 WORKBITS = 1

diff --git a/src/gns/test_gns_nick_shorten.sh b/src/gns/test_gns_nick_shorten.sh
index 4e1d4cb606d738ad9157235e3e15e6a9cdcd09ae..9e76b970b461dead7c9308d27efc6d6b1a36c831 100755 (executable)
--- a/src/gns/test_gns_nick_shorten.sh
+++ b/src/gns/test_gns_nick_shorten.sh
@@ -54,8 +54,9 @@ gnunet-namestore -p -z testego  -a -n mail -t A -V $TEST_IP -e never -c test_gns
 gnunet-namestore -p -z delegatedego -a -n www -t A -V $TEST_IP -e never -c test_gns_lookup.conf
 
 # Delete namecache content
+gnunet-arm -c test_gns_lookup.conf -k gns
 gnunet-arm -c test_gns_lookup.conf -k namecache
-rm -rf `gnunet-config -c test_gns_lookup.conf -s namecache-sqlite -o FILENAME`
+rm -rf `gnunet-config -c test_gns_lookup.conf -s namecache-sqlite -o FILENAME -f`
 
 # Force start of GNS
 gnunet-arm -c test_gns_lookup.conf -i gns