fix #3284: support lib/MULTIARCH/ paths in installation, use GNUNET_PREFIX=@libdir...

[oweals/gnunet.git] / src / core / test_core_api_start_only.c

diff --git a/src/core/test_core_api_start_only.c b/src/core/test_core_api_start_only.c
index e98b374d2c149ba5d4da4b15856f47aab3b49ca3..255de0319da72d695cd4d33c20a595730ae3fa80 100644 (file)
--- a/src/core/test_core_api_start_only.c
+++ b/src/core/test_core_api_start_only.c
@@ -23,7 +23,6 @@
  *        connects to the core service and shuts down again
  */
 #include "platform.h"
-#include "gnunet_common.h"
 #include "gnunet_arm_service.h"
 #include "gnunet_core_service.h"
 #include "gnunet_getopt_lib.h"
@@ -104,14 +103,12 @@ shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 
 
 static void
-init_notify (void *cls, struct GNUNET_CORE_Handle *server,
+init_notify (void *cls,
              const struct GNUNET_PeerIdentity *my_identity)
 {
   struct PeerContext *p = cls;
 
-  GNUNET_assert (server != NULL);
-  GNUNET_assert (p->ch == server);
-  if (cls == &p1)
+  if (p == &p1)
   {
     /* connect p2 */
     p2.ch =
@@ -121,7 +118,7 @@ init_notify (void *cls, struct GNUNET_CORE_Handle *server,
   }
   else
   {
-    GNUNET_assert (cls == &p2);
+    GNUNET_assert (p == &p2);
     GNUNET_SCHEDULER_cancel (timeout_task_id);
     GNUNET_SCHEDULER_add_now (&shutdown_task, NULL);
   }
@@ -187,7 +184,7 @@ static void
 stop_arm (struct PeerContext *p)
 {
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stopping peer\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");