[GNUnet-SVN] r34045 - in gnunet/src: psycstore social

[gnunet]

Author: tg
Date: 2014-07-24 23:56:12 +0200 (Thu, 24 Jul 2014)
New Revision: 34045

Modified:
   gnunet/src/psycstore/test_psycstore.c
   gnunet/src/social/Makefile.am
Log:
social,psycstore: fix tests linking/debug

Modified: gnunet/src/psycstore/test_psycstore.c
===================================================================
--- gnunet/src/psycstore/test_psycstore.c       2014-07-24 15:46:45 UTC (rev 
34044)
+++ gnunet/src/psycstore/test_psycstore.c       2014-07-24 21:56:12 UTC (rev 
34045)
@@ -31,11 +31,9 @@
 #include "gnunet_testing_lib.h"
 #include "gnunet_psycstore_service.h"
 
-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 10)
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30)
 
-#define DEBUG_SERVICE 0
 
-
 /**
  * Return value from 'main'.
  */
@@ -483,7 +481,7 @@
  * @param peer handle to access more of the peer (not used)
  */
 static void
-#if DEBUG_SERVICE
+#if DEBUG_TEST_PSYCSTORE
 run (void *cls, char *const *args, const char *cfgfile,
      const struct GNUNET_CONFIGURATION_Handle *cfg)
 #else
@@ -513,7 +511,7 @@
 main (int argc, char *argv[])
 {
   res = 1;
-#if DEBUG_SERVICE
+#if DEBUG_TEST_PSYCSTORE
   const struct GNUNET_GETOPT_CommandLineOption opts[] = {
     GNUNET_GETOPT_OPTION_END
   };

Modified: gnunet/src/social/Makefile.am
===================================================================
--- gnunet/src/social/Makefile.am       2014-07-24 15:46:45 UTC (rev 34044)
+++ gnunet/src/social/Makefile.am       2014-07-24 21:56:12 UTC (rev 34045)
@@ -80,13 +80,17 @@
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/env/libgnunetenv.la \
-  $(top_builddir)/src/psyc/libgnunetpsycutil.la
+  $(top_builddir)/src/psyc/libgnunetpsycutil.la \
+  $(top_builddir)/src/core/libgnunetcore.la \
+  $(top_builddir)/src/identity/libgnunetidentity.la
 test_social_DEPENDENCIES = \
   libgnunetsocial.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/env/libgnunetenv.la \
-  $(top_builddir)/src/psyc/libgnunetpsycutil.la
+  $(top_builddir)/src/psyc/libgnunetpsycutil.la \
+  $(top_builddir)/src/core/libgnunetcore.la \
+  $(top_builddir)/src/identity/libgnunetidentity.la
 
 EXTRA_DIST = \
   test_social.conf