guix-env: some update.

[oweals/gnunet.git] / src / testing / test_testing_peerstartup.c

diff --git a/src/testing/test_testing_peerstartup.c b/src/testing/test_testing_peerstartup.c
index 9d3c0bb54129c9c5118b533c16a4f697476e9809..956788f6c376f37c85fc54e997b25bdebe81f2b6 100644 (file)
--- a/src/testing/test_testing_peerstartup.c
+++ b/src/testing/test_testing_peerstartup.c
@@ -1,6 +1,6 @@
 /*
       This file is part of GNUnet
-      (C) 2008, 2009, 2012 Christian Grothoff (and other contributing authors)
+      Copyright (C) 2008, 2009, 2012 GNUnet e.V.
 
       GNUnet is free software; you can redistribute it and/or modify
       it under the terms of the GNU General Public License as published
@@ -14,21 +14,20 @@
 
       You should have received a copy of the GNU General Public License
       along with GNUnet; see the file COPYING.  If not, write to the
-      Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-      Boston, MA 02111-1307, USA.
+      Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+      Boston, MA 02110-1301, USA.
  */
 
 /**
  * @file testing/test_testing_new_peerstartup.c
  * @brief test case for testing peer startup and shutdown using new testing
- *          library 
+ *          library
  * @author Sree Harsha Totakura
  */
 
 #include "platform.h"
-#include "gnunet_configuration_lib.h"
-#include "gnunet_os_lib.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_util_lib.h"
+#include "gnunet_testing_lib.h"
 
 #define LOG(kind,...)                           \
   GNUNET_log (kind, __VA_ARGS__)
@@ -47,7 +46,7 @@ struct TestingContext
    * The testing system
    */
   struct GNUNET_TESTING_System *system;
-  
+
   /**
    * The peer which has been started by the testing system
    */
@@ -64,13 +63,12 @@ struct TestingContext
  * Task for shutdown
  *
  * @param cls the testing context
- * @param tc the tast context
  */
 static void
-do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+do_shutdown (void *cls)
 {
   struct TestingContext *test_ctx = cls;
-  
+
   GNUNET_assert (NULL != test_ctx);
   if (NULL != test_ctx->peer)
   {
@@ -96,15 +94,15 @@ run (void *cls, char *const *args, const char *cfgfile,
   char *emsg;
   struct GNUNET_PeerIdentity id;
 
-  test_ctx = GNUNET_malloc (sizeof (struct TestingContext));
-  test_ctx->system = 
+  test_ctx = GNUNET_new (struct TestingContext);
+  test_ctx->system =
       GNUNET_TESTING_system_create ("test-gnunet-testing",
-                                    "127.0.0.1", NULL);
+                                    "127.0.0.1", NULL, NULL);
+  emsg = NULL;
   if (NULL == test_ctx->system)
     goto end;
   test_ctx->cfg = GNUNET_CONFIGURATION_dup (cfg);
-  emsg = NULL;
-  test_ctx->peer = 
+  test_ctx->peer =
       GNUNET_TESTING_peer_configure (test_ctx->system,
                                      test_ctx->cfg,
                                      0, &id, &emsg);
@@ -120,6 +118,7 @@ run (void *cls, char *const *args, const char *cfgfile,
 
  end:
   GNUNET_SCHEDULER_add_now (&do_shutdown, test_ctx);
+  GNUNET_free_non_null (emsg);
 }
 
 
@@ -132,7 +131,7 @@ int main (int argc, char *argv[])
   status = GNUNET_SYSERR;
   if (GNUNET_OK !=
       GNUNET_PROGRAM_run (argc, argv,
-                          "test_testing_new_peerstartup",
+                          "test_testing_peerstartup",
                           "test case for peerstartup using new testing library",
                           options, &run, NULL))
     return 1;