From: Matthias Wachs <wachs@net.in.tum.de>
Date: Mon, 17 May 2010 10:52:22 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: initial-import-from-subversion-38251~21682
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f128dd15c4d15dfb947cb56a6821242a293f1114;p=oweals%2Fgnunet.git

---

diff --git a/src/hostlist/Makefile.am b/src/hostlist/Makefile.am
index 5e67d034c..d02215fa6 100644
--- a/src/hostlist/Makefile.am
+++ b/src/hostlist/Makefile.am
@@ -33,11 +33,14 @@ gnunet_daemon_hostlist_CPPFLAGS = \
 
 check_PROGRAMS = \
  test_gnunet_daemon_hostlist \
+ test_gnunet_hostlist \
  test_gnunet_daemon_hostlist_learning
 
 if HAVE_MHD
-TESTS = test_gnunet_daemon_hostlist \
- test_gnunet_daemon_hostlist_learning
+TESTS = \
+ test_gnunet_daemon_hostlist \
+ test_gnunet_daemon_hostlist_learning \
+ test_gnunet_hostlist
 endif
 
 test_gnunet_daemon_hostlist_SOURCES = \
@@ -47,6 +50,15 @@ test_gnunet_daemon_hostlist_LDADD = \
   $(top_builddir)/src/arm/libgnunetarm.la \
   $(top_builddir)/src/util/libgnunetutil.la  
 
+test_gnunet_hostlist_SOURCES = \
+ test_gnunet_hostlist.c
+test_gnunet_hostlist_LDADD = \
+  $(top_builddir)/src/transport/libgnunettransport.la \
+  $(top_builddir)/src/arm/libgnunetarm.la \
+  $(top_builddir)/src/core/libgnunetcore.la \
+  $(top_builddir)/src/statistics/libgnunetstatistics.la \
+  $(top_builddir)/src/util/libgnunetutil.la  
+
 test_gnunet_daemon_hostlist_learning_SOURCES = \
  test_gnunet_daemon_hostlist_learning.c
 test_gnunet_daemon_hostlist_learning_LDADD = \
diff --git a/src/hostlist/test_gnunet_daemon_hostlist_learning.c b/src/hostlist/test_gnunet_daemon_hostlist_learning.c
index 1ab0f4edc..db9ef6476 100644
--- a/src/hostlist/test_gnunet_daemon_hostlist_learning.c
+++ b/src/hostlist/test_gnunet_daemon_hostlist_learning.c
@@ -38,7 +38,7 @@
 /**
  * How long until wait until testcases fails
  */
-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 240)
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30)
 #define CHECK_INTERVALL GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 1)
 
 static int timeout;
@@ -98,6 +98,8 @@ waitpid_task (void *cls,
 
 static void shutdown_testcase()
 {
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Shutdown testcase....\n");
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stopping Timeout Task.\n");
   if (timeout_task != GNUNET_SCHEDULER_NO_TASK)
   {
     GNUNET_SCHEDULER_cancel (sched,
@@ -146,6 +148,7 @@ static void shutdown_testcase()
   GNUNET_SCHEDULER_add_now (sched,
 			    &waitpid_task, &adv_peer);
   GNUNET_SCHEDULER_shutdown (sched);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Shutdown complete....\n");
 }
 
 /**