disable

diff --git a/src/hostlist/Makefile.am b/src/hostlist/Makefile.am
index 9a01b08dab442465c9aa4582234392ad3ed5d136..ac14099619b396b9ccec876597748b63a4a9fc5f 100644 (file)
--- a/src/hostlist/Makefile.am
+++ b/src/hostlist/Makefile.am
@@ -32,7 +32,7 @@ gnunet_daemon_hostlist_CPPFLAGS = \
 check_PROGRAMS = \
  test_gnunet_daemon_hostlist
 
-TESTS = $(check_PROGRAMS) $(check_SCRIPTS)
+# TESTS = $(check_PROGRAMS) $(check_SCRIPTS)
 
 test_gnunet_daemon_hostlist_SOURCES = \
  test_gnunet_daemon_hostlist.c
@@ -42,6 +42,7 @@ test_gnunet_daemon_hostlist_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la  
 
 EXTRA_DIST = \
+  test_gnunet_daemon_hostlist_data.conf \
   test_gnunet_daemon_hostlist_data_peer1.conf \
   test_gnunet_daemon_hostlist_data_peer2.conf 
 

diff --git a/src/hostlist/test_gnunet_daemon_hostlist.c b/src/hostlist/test_gnunet_daemon_hostlist.c
index 63f6e521037403c384e6670ba3793a768f0a77de..e99b486cc645ce96e95a692178bc81027bb6b956 100644 (file)
--- a/src/hostlist/test_gnunet_daemon_hostlist.c
+++ b/src/hostlist/test_gnunet_daemon_hostlist.c
@@ -141,7 +141,7 @@ static int
 check ()
 {
   char *const argv[] = { "test-gnunet-daemon-hostlist",
-    "-c", "test_gnunet_daemon_hostlist.conf",
+    "-c", "test_gnunet_daemon_hostlist_data.conf",
 #if VERBOSE
     "-L", "DEBUG",
 #endif

diff --git a/src/hostlist/test_gnunet_daemon_hostlist_data.conf b/src/hostlist/test_gnunet_daemon_hostlist_data.conf
new file mode 100644 (file)
index 0000000..15a52e3
--- /dev/null
+++ b/src/hostlist/test_gnunet_daemon_hostlist_data.conf
@@ -0,0 +1,17 @@
+[PATHS]
+SERVICEHOME = /tmp/test-gnunetd-hostlist/
+DEFAULTCONFIG = /etc/gnunetd.conf
+
+[hostlist]
+PORT = 23354
+# port for hostlist http server
+HTTPPORT = 28080
+HOSTNAME = localhost
+HOME = $SERVICEHOME
+CONFIG = $DEFAULTCONFIG
+BINARY = gnunet-daemon-hostlist
+# consider having "-e" as default as well once implemented
+OPTIONS = -b
+SERVERS = http://gnunet.org:8080/
+# proxy for downloading hostlists
+HTTP-PROXY = 
\ No newline at end of file

diff --git a/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf b/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf
new file mode 100644 (file)
index 0000000..1228a98
--- /dev/null
+++ b/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf
@@ -0,0 +1,29 @@
+[PATHS]
+SERVICEHOME = /tmp/test-gnunetd-hostlist-peer-1/
+DEFAULTCONFIG = test_gnunet_daemon_hostlist_peer1.conf
+
+[resolver]
+PORT = 12964
+
+[transport]
+PORT = 12965
+PLUGINS = tcp
+#DEBUG = YES
+
+[arm]
+PORT = 12966
+
+[statistics]
+PORT = 12967
+
+[transport-tcp]
+PORT = 12968
+
+[peerinfo]
+PORT = 12969
+
+[core]
+PORT = 12970
+
+[testing]
+WEAKRANDOM = YES

diff --git a/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf b/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf
new file mode 100644 (file)
index 0000000..f8c9d4e
--- /dev/null
+++ b/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf
@@ -0,0 +1,29 @@
+[PATHS]
+SERVICEHOME = /tmp/test-gnunetd-hostlist-peer-2/
+DEFAULTCONFIG = test_gnunet_daemon_hostlist_peer2.conf
+
+[resolver]
+PORT = 22964
+
+[transport]
+PORT = 22965
+PLUGINS = tcp
+#DEBUG = YES
+
+[arm]
+PORT = 22966
+
+[statistics]
+PORT = 22967
+
+[transport-tcp]
+PORT = 22968
+
+[peerinfo]
+PORT = 22969
+
+[core]
+PORT = 22970
+
+[testing]
+WEAKRANDOM = YES