[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r27725 - in gnunet/src: dht experimentation gns lockmanager
From: |
gnunet |
Subject: |
[GNUnet-SVN] r27725 - in gnunet/src: dht experimentation gns lockmanager mesh peerinfo stream testbed |
Date: |
Tue, 2 Jul 2013 16:39:23 +0200 |
Author: grothoff
Date: 2013-07-02 16:39:23 +0200 (Tue, 02 Jul 2013)
New Revision: 27725
Modified:
gnunet/src/dht/test_dht_api_data.conf
gnunet/src/dht/test_dht_api_peer1.conf
gnunet/src/dht/test_dht_monitor.conf
gnunet/src/dht/test_dht_multipeer.conf
gnunet/src/experimentation/test_experimentation_clique.conf
gnunet/src/gns/test_gns_defaults.conf
gnunet/src/gns/test_gns_dht_default.conf
gnunet/src/gns/test_gns_simple_lookup.conf
gnunet/src/lockmanager/test_lockmanager_api.conf
gnunet/src/mesh/test_mesh.conf
gnunet/src/peerinfo/Makefile.am
gnunet/src/stream/test_stream_local.conf
gnunet/src/testbed/test_testbed_api.conf
gnunet/src/testbed/test_testbed_api_statistics.conf
gnunet/src/testbed/test_testbed_api_test_timeout.conf
gnunet/src/testbed/test_testbed_api_testbed_run_topology2dtorus.conf
gnunet/src/testbed/test_testbed_api_testbed_run_topologyclique.conf
gnunet/src/testbed/test_testbed_api_testbed_run_topologyfromfile.conf
gnunet/src/testbed/test_testbed_api_testbed_run_topologyline.conf
gnunet/src/testbed/test_testbed_api_testbed_run_topologyrandom.conf
gnunet/src/testbed/test_testbed_api_testbed_run_topologyring.conf
gnunet/src/testbed/test_testbed_api_testbed_run_topologyscalefree.conf
gnunet/src/testbed/test_testbed_api_testbed_run_topologysmallworld.conf
gnunet/src/testbed/test_testbed_api_testbed_run_topologysmallworldring.conf
Log:
-removing dead options
Modified: gnunet/src/dht/test_dht_api_data.conf
===================================================================
--- gnunet/src/dht/test_dht_api_data.conf 2013-07-02 14:39:09 UTC (rev
27724)
+++ gnunet/src/dht/test_dht_api_data.conf 2013-07-02 14:39:23 UTC (rev
27725)
@@ -30,9 +30,6 @@
[dht]
PORT = 12370
-[block]
-plugins = dht test
-
[transport]
plugins = tcp
NEIGHBOUR_LIMIT = 50
@@ -55,16 +52,6 @@
TIMEOUT = 300 s
PORT = 2094
-[TESTING]
-WEAKRANDOM = NO
-
-[testing_old]
-HOSTKEYSFILE = ${DATADIR}/testing_hostkeys.dat
-
-[gnunetd]
-HOSTKEY = $SERVICEHOME/.hostkey
-
-
[nat]
DISABLEV6 = YES
BINDTO = 127.0.0.1
@@ -83,8 +70,5 @@
[nse]
AUTOSTART = NO
-
[vpn]
AUTOSTART=NO
-
-
Modified: gnunet/src/dht/test_dht_api_peer1.conf
===================================================================
--- gnunet/src/dht/test_dht_api_peer1.conf 2013-07-02 14:39:09 UTC (rev
27724)
+++ gnunet/src/dht/test_dht_api_peer1.conf 2013-07-02 14:39:23 UTC (rev
27725)
@@ -12,9 +12,6 @@
PORT = 12100
BINARY = gnunet-service-dht
-[block]
-plugins = dht test
-
[dhtcache]
QUOTA = 1 MB
DATABASE = heap
@@ -42,16 +39,9 @@
PORT = 12368
BINDTO = 127.0.0.1
-[TESTING]
-WEAKRANDOM = YES
-
-[gnunetd]
-HOSTKEY = $SERVICEHOME/.hostkey
-
[PATHS]
SERVICEHOME = /tmp/test-gnunetd-dht-peer-1/
-
[nat]
DISABLEV6 = YES
ENABLE_UPNP = NO
@@ -64,12 +54,9 @@
[dns]
AUTOSTART = NO
-
-
[nse]
AUTOSTART = NO
-
[vpn]
AUTOSTART=NO
Modified: gnunet/src/dht/test_dht_monitor.conf
===================================================================
--- gnunet/src/dht/test_dht_monitor.conf 2013-07-02 14:39:09 UTC (rev
27724)
+++ gnunet/src/dht/test_dht_monitor.conf 2013-07-02 14:39:23 UTC (rev
27725)
@@ -4,9 +4,6 @@
[resolver]
AUTOSTART = NO
-[block]
-plugins = test dht
-
[dhtcache]
QUOTA = 1 MB
DATABASE = heap
@@ -21,17 +18,11 @@
[arm]
DEFAULTSERVICES = dht core
-[TESTING]
-WEAKRANDOM = YES
-
[testbed]
OVERLAY_TOPOLOGY = LINE
-[gnunetd]
-HOSTKEY = $SERVICEHOME/.hostkey
-
[PATHS]
-SERVICEHOME = /tmp/test-dht-multipeer/
+SERVICEHOME = /tmp/test-dht-monitor/
[nat]
DISABLEV6 = YES
Modified: gnunet/src/dht/test_dht_multipeer.conf
===================================================================
--- gnunet/src/dht/test_dht_multipeer.conf 2013-07-02 14:39:09 UTC (rev
27724)
+++ gnunet/src/dht/test_dht_multipeer.conf 2013-07-02 14:39:23 UTC (rev
27725)
@@ -4,9 +4,6 @@
[resolver]
AUTOSTART = NO
-[block]
-plugins = test dht
-
[dhtcache]
QUOTA = 1 MB
DATABASE = heap
Modified: gnunet/src/experimentation/test_experimentation_clique.conf
===================================================================
--- gnunet/src/experimentation/test_experimentation_clique.conf 2013-07-02
14:39:09 UTC (rev 27724)
+++ gnunet/src/experimentation/test_experimentation_clique.conf 2013-07-02
14:39:23 UTC (rev 27725)
@@ -20,13 +20,9 @@
AUTOSTART = YES
DISABLE_TRY_CONNECT = NO
-
-[block]
-plugins = dht test
-
[dhtcache]
QUOTA = 1 MB
-DATABASE = sqlite
+DATABASE = heap
[transport]
PLUGINS = udp
@@ -57,11 +53,8 @@
TIMEOUT = 300 s
PORT = 12368
-[gnunetd]
-HOSTKEY = $SERVICEHOME/.hostkey
-
[PATHS]
-SERVICEHOME = /tmp/test-testbed/
+SERVICEHOME = /tmp/test-experimentation/
[dns]
AUTOSTART = NO
Modified: gnunet/src/gns/test_gns_defaults.conf
===================================================================
--- gnunet/src/gns/test_gns_defaults.conf 2013-07-02 14:39:09 UTC (rev
27724)
+++ gnunet/src/gns/test_gns_defaults.conf 2013-07-02 14:39:23 UTC (rev
27725)
@@ -27,7 +27,6 @@
[testing]
NUM_PEERS = 5
-WEAKRANDOM = YES
F2F = YES
HOSTKEYSFILE = ${DATADIR}/testing_hostkeys.dat
Modified: gnunet/src/gns/test_gns_dht_default.conf
===================================================================
--- gnunet/src/gns/test_gns_dht_default.conf 2013-07-02 14:39:09 UTC (rev
27724)
+++ gnunet/src/gns/test_gns_dht_default.conf 2013-07-02 14:39:23 UTC (rev
27725)
@@ -14,12 +14,9 @@
PORT = 2102
BINARY = gnunet-service-dht
-[block]
-plugins = dht test gns
-
[dhtcache]
QUOTA = 1 MB
-DATABASE = sqlite
+DATABASE = heap
[arm]
PORT = 22566
Modified: gnunet/src/gns/test_gns_simple_lookup.conf
===================================================================
--- gnunet/src/gns/test_gns_simple_lookup.conf 2013-07-02 14:39:09 UTC (rev
27724)
+++ gnunet/src/gns/test_gns_simple_lookup.conf 2013-07-02 14:39:23 UTC (rev
27725)
@@ -14,12 +14,9 @@
PORT = 12100
BINARY = gnunet-service-dht
-[block]
-plugins = dht test gns
-
[dhtcache]
QUOTA = 1 MB
-DATABASE = sqlite
+DATABASE = heap
[transport]
PLUGINS = tcp
@@ -44,12 +41,6 @@
PORT = 12368
BINDTO = 127.0.0.1
-[TESTING]
-WEAKRANDOM = YES
-
-[gnunetd]
-HOSTKEY = zonefiles/test_zonekey
-
[PATHS]
SERVICEHOME = /tmp/test-gnunetd-gns-peer-1/
Modified: gnunet/src/lockmanager/test_lockmanager_api.conf
===================================================================
--- gnunet/src/lockmanager/test_lockmanager_api.conf 2013-07-02 14:39:09 UTC
(rev 27724)
+++ gnunet/src/lockmanager/test_lockmanager_api.conf 2013-07-02 14:39:23 UTC
(rev 27725)
@@ -18,12 +18,9 @@
[dht]
AUTOSTART = NO
-[block]
-plugins = dht test
-
[dhtcache]
QUOTA = 1 MB
-DATABASE = sqlite
+DATABASE = heap
[transport]
PLUGINS = tcp
@@ -49,15 +46,11 @@
[TESTING]
NUM_PEERS = 5
-WEAKRANDOM = YES
HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
MAX_CONCURRENT_SSH = 10
USE_PROGRESSBARS = YES
PEERGROUP_TIMEOUT = 2400 s
-[gnunetd]
-HOSTKEY = $SERVICEHOME/.hostkey
-
[PATHS]
SERVICEHOME = /tmp/test-lockmanager/
Modified: gnunet/src/mesh/test_mesh.conf
===================================================================
--- gnunet/src/mesh/test_mesh.conf 2013-07-02 14:39:09 UTC (rev 27724)
+++ gnunet/src/mesh/test_mesh.conf 2013-07-02 14:39:23 UTC (rev 27725)
@@ -41,12 +41,9 @@
DISABLE_TRY_CONNECT = YES
FORCE_NSE = 3
-[block]
-plugins = dht test
-
[dhtcache]
QUOTA = 1 MB
-DATABASE = sqlite
+DATABASE = heap
[transport]
PLUGINS = tcp
@@ -70,12 +67,6 @@
TIMEOUT = 300 s
PORT = 12368
-[TESTING]
-WEAKRANDOM = YES
-
-[gnunetd]
-HOSTKEY = $SERVICEHOME/.hostkey
-
[dns]
AUTOSTART = NO
Modified: gnunet/src/peerinfo/Makefile.am
===================================================================
--- gnunet/src/peerinfo/Makefile.am 2013-07-02 14:39:09 UTC (rev 27724)
+++ gnunet/src/peerinfo/Makefile.am 2013-07-02 14:39:23 UTC (rev 27725)
@@ -48,13 +48,14 @@
if HAVE_TESTING
check_PROGRAMS = \
- test_peerinfo_shipped_hellos \
test_peerinfo_api \
test_peerinfo_api_friend_only \
test_peerinfo_api_notify_friend_only \
$(PEERINFO_BENCHMARKS)
endif
+# test_peerinfo_shipped_hellos
+
if ENABLE_TEST_RUN
TESTS = $(check_PROGRAMS)
endif
Modified: gnunet/src/stream/test_stream_local.conf
===================================================================
--- gnunet/src/stream/test_stream_local.conf 2013-07-02 14:39:09 UTC (rev
27724)
+++ gnunet/src/stream/test_stream_local.conf 2013-07-02 14:39:23 UTC (rev
27725)
@@ -30,9 +30,6 @@
HOSTNAME = localhost
PORT = 12100
-[block]
-plugins = dht test
-
[dhtcache]
QUOTA = 1 MB
DATABASE = sqlite
Modified: gnunet/src/testbed/test_testbed_api.conf
===================================================================
--- gnunet/src/testbed/test_testbed_api.conf 2013-07-02 14:39:09 UTC (rev
27724)
+++ gnunet/src/testbed/test_testbed_api.conf 2013-07-02 14:39:23 UTC (rev
27725)
@@ -19,12 +19,9 @@
[dht]
AUTOSTART = NO
-[block]
-plugins = dht test
-
[dhtcache]
QUOTA = 1 MB
-DATABASE = sqlite
+DATABASE = heap
[transport]
PLUGINS = udp
Modified: gnunet/src/testbed/test_testbed_api_statistics.conf
===================================================================
--- gnunet/src/testbed/test_testbed_api_statistics.conf 2013-07-02 14:39:09 UTC
(rev 27724)
+++ gnunet/src/testbed/test_testbed_api_statistics.conf 2013-07-02 14:39:23 UTC
(rev 27725)
@@ -20,12 +20,9 @@
[dht]
AUTOSTART = NO
-[block]
-plugins = dht test
-
[dhtcache]
QUOTA = 1 MB
-DATABASE = sqlite
+DATABASE = heap
[transport]
PLUGINS = tcp
Modified: gnunet/src/testbed/test_testbed_api_test_timeout.conf
===================================================================
--- gnunet/src/testbed/test_testbed_api_test_timeout.conf 2013-07-02
14:39:09 UTC (rev 27724)
+++ gnunet/src/testbed/test_testbed_api_test_timeout.conf 2013-07-02
14:39:23 UTC (rev 27725)
@@ -19,12 +19,9 @@
[dht]
AUTOSTART = NO
-[block]
-plugins = dht test
-
[dhtcache]
QUOTA = 1 MB
-DATABASE = sqlite
+DATABASE = heap
[transport]
PLUGINS = tcp
Modified: gnunet/src/testbed/test_testbed_api_testbed_run_topology2dtorus.conf
===================================================================
--- gnunet/src/testbed/test_testbed_api_testbed_run_topology2dtorus.conf
2013-07-02 14:39:09 UTC (rev 27724)
+++ gnunet/src/testbed/test_testbed_api_testbed_run_topology2dtorus.conf
2013-07-02 14:39:23 UTC (rev 27725)
@@ -19,12 +19,9 @@
[dht]
AUTOSTART = NO
-[block]
-plugins = dht test
-
[dhtcache]
QUOTA = 1 MB
-DATABASE = sqlite
+DATABASE = heap
[transport]
PLUGINS = tcp
Modified: gnunet/src/testbed/test_testbed_api_testbed_run_topologyclique.conf
===================================================================
--- gnunet/src/testbed/test_testbed_api_testbed_run_topologyclique.conf
2013-07-02 14:39:09 UTC (rev 27724)
+++ gnunet/src/testbed/test_testbed_api_testbed_run_topologyclique.conf
2013-07-02 14:39:23 UTC (rev 27725)
@@ -19,12 +19,9 @@
[dht]
AUTOSTART = NO
-[block]
-plugins = dht test
-
[dhtcache]
QUOTA = 1 MB
-DATABASE = sqlite
+DATABASE = heap
[transport]
PLUGINS = tcp
Modified: gnunet/src/testbed/test_testbed_api_testbed_run_topologyfromfile.conf
===================================================================
--- gnunet/src/testbed/test_testbed_api_testbed_run_topologyfromfile.conf
2013-07-02 14:39:09 UTC (rev 27724)
+++ gnunet/src/testbed/test_testbed_api_testbed_run_topologyfromfile.conf
2013-07-02 14:39:23 UTC (rev 27725)
@@ -20,12 +20,9 @@
[dht]
AUTOSTART = NO
-[block]
-plugins = dht test
-
[dhtcache]
QUOTA = 1 MB
-DATABASE = sqlite
+DATABASE = heap
[transport]
PLUGINS = udp
Modified: gnunet/src/testbed/test_testbed_api_testbed_run_topologyline.conf
===================================================================
--- gnunet/src/testbed/test_testbed_api_testbed_run_topologyline.conf
2013-07-02 14:39:09 UTC (rev 27724)
+++ gnunet/src/testbed/test_testbed_api_testbed_run_topologyline.conf
2013-07-02 14:39:23 UTC (rev 27725)
@@ -19,12 +19,9 @@
[dht]
AUTOSTART = NO
-[block]
-plugins = dht test
-
[dhtcache]
QUOTA = 1 MB
-DATABASE = sqlite
+DATABASE = heap
[transport]
PLUGINS = tcp
Modified: gnunet/src/testbed/test_testbed_api_testbed_run_topologyrandom.conf
===================================================================
--- gnunet/src/testbed/test_testbed_api_testbed_run_topologyrandom.conf
2013-07-02 14:39:09 UTC (rev 27724)
+++ gnunet/src/testbed/test_testbed_api_testbed_run_topologyrandom.conf
2013-07-02 14:39:23 UTC (rev 27725)
@@ -19,12 +19,9 @@
[dht]
AUTOSTART = NO
-[block]
-plugins = dht test
-
[dhtcache]
QUOTA = 1 MB
-DATABASE = sqlite
+DATABASE = heap
[transport]
PLUGINS = tcp
Modified: gnunet/src/testbed/test_testbed_api_testbed_run_topologyring.conf
===================================================================
--- gnunet/src/testbed/test_testbed_api_testbed_run_topologyring.conf
2013-07-02 14:39:09 UTC (rev 27724)
+++ gnunet/src/testbed/test_testbed_api_testbed_run_topologyring.conf
2013-07-02 14:39:23 UTC (rev 27725)
@@ -19,12 +19,9 @@
[dht]
AUTOSTART = NO
-[block]
-plugins = dht test
-
[dhtcache]
QUOTA = 1 MB
-DATABASE = sqlite
+DATABASE = heap
[transport]
PLUGINS = tcp
Modified: gnunet/src/testbed/test_testbed_api_testbed_run_topologyscalefree.conf
===================================================================
--- gnunet/src/testbed/test_testbed_api_testbed_run_topologyscalefree.conf
2013-07-02 14:39:09 UTC (rev 27724)
+++ gnunet/src/testbed/test_testbed_api_testbed_run_topologyscalefree.conf
2013-07-02 14:39:23 UTC (rev 27725)
@@ -19,12 +19,9 @@
[dht]
AUTOSTART = NO
-[block]
-plugins = dht test
-
[dhtcache]
QUOTA = 1 MB
-DATABASE = sqlite
+DATABASE = heap
[transport]
PLUGINS = tcp
Modified:
gnunet/src/testbed/test_testbed_api_testbed_run_topologysmallworld.conf
===================================================================
--- gnunet/src/testbed/test_testbed_api_testbed_run_topologysmallworld.conf
2013-07-02 14:39:09 UTC (rev 27724)
+++ gnunet/src/testbed/test_testbed_api_testbed_run_topologysmallworld.conf
2013-07-02 14:39:23 UTC (rev 27725)
@@ -19,12 +19,9 @@
[dht]
AUTOSTART = NO
-[block]
-plugins = dht test
-
[dhtcache]
QUOTA = 1 MB
-DATABASE = sqlite
+DATABASE = heap
[transport]
PLUGINS = tcp
Modified:
gnunet/src/testbed/test_testbed_api_testbed_run_topologysmallworldring.conf
===================================================================
--- gnunet/src/testbed/test_testbed_api_testbed_run_topologysmallworldring.conf
2013-07-02 14:39:09 UTC (rev 27724)
+++ gnunet/src/testbed/test_testbed_api_testbed_run_topologysmallworldring.conf
2013-07-02 14:39:23 UTC (rev 27725)
@@ -19,12 +19,9 @@
[dht]
AUTOSTART = NO
-[block]
-plugins = dht test
-
[dhtcache]
QUOTA = 1 MB
-DATABASE = sqlite
+DATABASE = heap
[transport]
PLUGINS = tcp
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r27725 - in gnunet/src: dht experimentation gns lockmanager mesh peerinfo stream testbed,
gnunet <=