[GNUnet-SVN] r14118 - gnunet/src/core

[gnunet]

Author: nevans
Date: 2011-01-05 17:44:08 +0100 (Wed, 05 Jan 2011)
New Revision: 14118

Modified:
   gnunet/src/core/Makefile.am
   gnunet/src/core/test_core_api_send_to_self.c
Log:
hopefully send to self test will run on buildbots

Modified: gnunet/src/core/Makefile.am
===================================================================
--- gnunet/src/core/Makefile.am 2011-01-05 16:29:04 UTC (rev 14117)
+++ gnunet/src/core/Makefile.am 2011-01-05 16:44:08 UTC (rev 14118)
@@ -25,7 +25,7 @@
 
 
 bin_PROGRAMS = \
- gnunet-service-core test_core_api_send_to_self
+ gnunet-service-core
 
 gnunet_service_core_SOURCES = \
  gnunet-service-core.c 

Modified: gnunet/src/core/test_core_api_send_to_self.c
===================================================================
--- gnunet/src/core/test_core_api_send_to_self.c        2011-01-05 16:29:04 UTC 
(rev 14117)
+++ gnunet/src/core/test_core_api_send_to_self.c        2011-01-05 16:44:08 UTC 
(rev 14118)
@@ -48,6 +48,11 @@
 struct GNUNET_CORE_Handle *core;
 
 /**
+ * Handle to gnunet-service-arm.
+ */
+struct GNUNET_OS_Process *arm_proc;
+
+/**
  * Function scheduled as very last function, cleans up after us
  */
 static void
@@ -62,6 +67,19 @@
       core = NULL;
     }
 
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Stopping peer\n");
+  if (0 != GNUNET_OS_process_kill (arm_proc, SIGTERM))
+    GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
+
+  if (GNUNET_OS_process_wait(arm_proc) != GNUNET_OK)
+    GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid");
+
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "ARM process %u stopped\n", GNUNET_OS_process_get_pid 
(arm_proc));
+  GNUNET_OS_process_close (arm_proc);
+  arm_proc = NULL;
+
   GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Ending test.\n");
 }
 
@@ -137,18 +155,28 @@
 static void
 run (void *cls,
      char *const *args,
-     const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *cfg_)
+     const char *cfgfile,
+     const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
   const static struct GNUNET_CORE_MessageHandler handlers[] = {
-    {receive, GNUNET_MESSAGE_TYPE_SERVICE_UDP, 0},
+    {&receive, GNUNET_MESSAGE_TYPE_SERVICE_UDP, 0},
     {NULL, 0, 0}
   };
-  core = GNUNET_CORE_connect (cfg_,
+
+  arm_proc = GNUNET_OS_start_process (NULL, NULL, "gnunet-service-arm",
+                                        "gnunet-service-arm",
+#if VERBOSE
+                                        "-L", "DEBUG",
+#endif
+                                        "-c", "test_core_api_data.conf", NULL);
+
+  core = GNUNET_CORE_connect (cfg,
                              42,
                              NULL,
-                             init,
-                             connect_cb,
+                             &init,
+                             &connect_cb,
                              NULL, NULL, NULL, 0, NULL, 0, handlers);
+
   die_task = 
GNUNET_SCHEDULER_add_delayed(GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS,
 60), &cleanup, cls);
 }