towards reviving priorities in core API, this time with enum to make classes clearer

[oweals/gnunet.git] / src / hostlist / test_gnunet_daemon_hostlist_reconnect.c

diff --git a/src/hostlist/test_gnunet_daemon_hostlist_reconnect.c b/src/hostlist/test_gnunet_daemon_hostlist_reconnect.c
index 3b1107e62f59397dada04d6834550d62201f0c50..6b38ffe19dc61006a4b219951009bddce2a2daa2 100644 (file)
--- a/src/hostlist/test_gnunet_daemon_hostlist_reconnect.c
+++ b/src/hostlist/test_gnunet_daemon_hostlist_reconnect.c
@@ -153,7 +153,7 @@ waitpid_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   struct PeerContext *p = cls;
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Killing ARM process.\n");
-  if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM))
+  if (0 != GNUNET_OS_process_kill (p->arm_proc, GNUNET_TERM_SIG))
     GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
   if (GNUNET_OS_process_wait (p->arm_proc) != GNUNET_OK)
     GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid");
@@ -199,9 +199,9 @@ run (void *cls, char *const *args, const char *cfgfile,
 
 
 int
-main (int argc, char *argv[])
+main (int argcx, char *argvx[])
 {
-  static char *const argv[] = { 
+  static char *const argv[] = {
     "test-gnunet-daemon-hostlist",
     "-c", "test_gnunet_daemon_hostlist_data.conf",
     NULL
@@ -224,7 +224,10 @@ main (int argc, char *argv[])
   {
     FPRINTF (stderr, "%s",  ".");
     /* now do it again */
-    ret = check ();
+    ok = 1;
+    GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, argv,
+                       "test-gnunet-daemon-hostlist", "nohelp", options, &run,
+                       &ok);
     FPRINTF (stderr, "%s",  ".\n");
   }
   GNUNET_DISK_directory_remove ("/tmp/test-gnunet-hostlist-peer-1");