From 67b1894ada8e7576a558cd72a7e0a7f34030ccf3 Mon Sep 17 00:00:00 2001 From: Matthias Wachs Date: Thu, 28 Nov 2013 15:36:56 +0000 Subject: [PATCH] changes to config and test due to test directory --- src/gns/test_gns_defaults.conf | 3 +++ src/gns/test_gns_lookup.conf | 10 ++++------ src/gns/test_gns_nick_shorten.sh | 3 ++- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/gns/test_gns_defaults.conf b/src/gns/test_gns_defaults.conf index 27024f783..60efa2693 100644 --- 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 bf3ac592d..219d82f8a 100644 --- 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 4e1d4cb60..9e76b970b 100755 --- 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 -- 2.25.1