diff options
author | Matthias Wachs <wachs@net.in.tum.de> | 2013-11-28 15:36:56 +0000 |
---|---|---|
committer | Matthias Wachs <wachs@net.in.tum.de> | 2013-11-28 15:36:56 +0000 |
commit | 67b1894ada8e7576a558cd72a7e0a7f34030ccf3 (patch) | |
tree | 51f41482352be5b3bf21e19adbaedd062f758d17 /src | |
parent | c74897a7cc2d6f836e83b1b7423362ba11323fcc (diff) | |
download | gnunet-67b1894ada8e7576a558cd72a7e0a7f34030ccf3.tar.gz gnunet-67b1894ada8e7576a558cd72a7e0a7f34030ccf3.zip |
changes to config and test due to test directory
Diffstat (limited to 'src')
-rw-r--r-- | src/gns/test_gns_defaults.conf | 3 | ||||
-rw-r--r-- | src/gns/test_gns_lookup.conf | 10 | ||||
-rwxr-xr-x | 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/ | |||
4 | [namestore-sqlite] | 4 | [namestore-sqlite] |
5 | FILENAME = $GNUNET_TEST_HOME/namestore/sqlite_test.db | 5 | FILENAME = $GNUNET_TEST_HOME/namestore/sqlite_test.db |
6 | 6 | ||
7 | [namecache-sqlite] | ||
8 | FILENAME=$GNUNET_TEST_HOME/namecache/namecache.db | ||
9 | |||
7 | [identity] | 10 | [identity] |
8 | # Directory where we store information about our egos | 11 | # Directory where we store information about our egos |
9 | EGODIR = $GNUNET_TEST_HOME/identity/egos/ | 12 | 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 @@ | |||
1 | @INLINE@ test_gns_defaults.conf | 1 | @INLINE@ test_gns_defaults.conf |
2 | |||
3 | [PATHS] | ||
4 | GNUNET_TEST_HOME = /tmp/test-gnunet-gns-peer-1/ | ||
5 | |||
2 | [dht] | 6 | [dht] |
3 | AUTOSTART = YES | 7 | AUTOSTART = YES |
4 | 8 | ||
@@ -8,9 +12,6 @@ PLUGINS = | |||
8 | [arm] | 12 | [arm] |
9 | DEFAULTSERVICES = | 13 | DEFAULTSERVICES = |
10 | 14 | ||
11 | [PATHS] | ||
12 | GNUNET_TEST_HOME = /tmp/test-gnunet-gns-peer-1/ | ||
13 | |||
14 | [gns] | 15 | [gns] |
15 | #PREFIX = valgrind --leak-check=full --track-origins=yes | 16 | #PREFIX = valgrind --leak-check=full --track-origins=yes |
16 | AUTOSTART = YES | 17 | AUTOSTART = YES |
@@ -21,8 +22,5 @@ RECORD_PUT_INTERVAL = 1 h | |||
21 | ZONE_PUBLISH_TIME_WINDOW = 1 h | 22 | ZONE_PUBLISH_TIME_WINDOW = 1 h |
22 | DNS_ROOT=PD67SGHF3E0447TU9HADIVU9OM7V4QHTOG0EBU69TFRI2LG63DR0 | 23 | DNS_ROOT=PD67SGHF3E0447TU9HADIVU9OM7V4QHTOG0EBU69TFRI2LG63DR0 |
23 | 24 | ||
24 | [namecache-sqlite] | ||
25 | FILENAME=/tmp/test-gnunet-gns-peer-1/namecache.db | ||
26 | |||
27 | [revocation] | 25 | [revocation] |
28 | WORKBITS = 1 | 26 | 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 | |||
54 | gnunet-namestore -p -z delegatedego -a -n www -t A -V $TEST_IP -e never -c test_gns_lookup.conf | 54 | gnunet-namestore -p -z delegatedego -a -n www -t A -V $TEST_IP -e never -c test_gns_lookup.conf |
55 | 55 | ||
56 | # Delete namecache content | 56 | # Delete namecache content |
57 | gnunet-arm -c test_gns_lookup.conf -k gns | ||
57 | gnunet-arm -c test_gns_lookup.conf -k namecache | 58 | gnunet-arm -c test_gns_lookup.conf -k namecache |
58 | rm -rf `gnunet-config -c test_gns_lookup.conf -s namecache-sqlite -o FILENAME` | 59 | rm -rf `gnunet-config -c test_gns_lookup.conf -s namecache-sqlite -o FILENAME -f` |
59 | 60 | ||
60 | # Force start of GNS | 61 | # Force start of GNS |
61 | gnunet-arm -c test_gns_lookup.conf -i gns | 62 | gnunet-arm -c test_gns_lookup.conf -i gns |