-need to do mkdir before testing UNIXPATH, not sure how this worked before

[oweals/gnunet.git] / src / testbed / gnunet-helper-testbed.c

diff --git a/src/testbed/gnunet-helper-testbed.c b/src/testbed/gnunet-helper-testbed.c
index 0bc6986ab3531e47465dcd4a7eb9a1be588e079c..43040e14672602edf81597f84a9511dcbba9b2ae 100644 (file)
--- a/src/testbed/gnunet-helper-testbed.c
+++ b/src/testbed/gnunet-helper-testbed.c
@@ -166,7 +166,7 @@ shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   if (NULL != testbed)
   {
     LOG_DEBUG ("Killing testbed\n");
-    GNUNET_break (0 == GNUNET_OS_process_kill (testbed, SIGTERM));
+    GNUNET_break (0 == GNUNET_OS_process_kill (testbed, GNUNET_TERM_SIG));
   }
   if (GNUNET_SCHEDULER_NO_TASK != read_task_id)
   {
@@ -298,7 +298,7 @@ child_death_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
     GNUNET_OS_process_destroy (testbed);
     testbed = NULL;
     /* Send SIGTERM to our process group */
-    if (0 != PLIBC_KILL (0, SIGTERM))
+    if (0 != PLIBC_KILL (0, GNUNET_TERM_SIG))
     {
       GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "signal");
       shutdown_now ();          /* Couldn't send the signal, we shutdown frowning */
@@ -409,7 +409,7 @@ tokenizer_cb (void *cls, void *client,
 #if WINDOWS
     GNUNET_break (0 == putenv (GNUNET_TESTING_PREFIX "="));
 #else
-    gnunet_break (0 == unsetenv (GNUNET_TESTING_PREFIX));
+    GNUNET_break (0 == unsetenv (GNUNET_TESTING_PREFIX));
 #endif
   }
   test_system =