- fix

[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 1de3d5b35aca13fb3c9edbf333d4347e43686f05..fb3967ce08400705329f5bbc54d8e214f023abe1 100644 (file)
--- a/src/testing/test_testing_peerstartup.c
+++ b/src/testing/test_testing_peerstartup.c
@@ -28,7 +28,7 @@
 #include "platform.h"
 #include "gnunet_configuration_lib.h"
 #include "gnunet_os_lib.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
 
 #define LOG(kind,...)                           \
   GNUNET_log (kind, __VA_ARGS__)
@@ -100,10 +100,10 @@ run (void *cls, char *const *args, const char *cfgfile,
   test_ctx->system = 
       GNUNET_TESTING_system_create ("test-gnunet-testing",
                                     "127.0.0.1", NULL);
+  emsg = NULL;
   if (NULL == test_ctx->system)
     goto end;
   test_ctx->cfg = GNUNET_CONFIGURATION_dup (cfg);
-  emsg = NULL;
   test_ctx->peer = 
       GNUNET_TESTING_peer_configure (test_ctx->system,
                                      test_ctx->cfg,
@@ -120,6 +120,7 @@ run (void *cls, char *const *args, const char *cfgfile,
 
  end:
   GNUNET_SCHEDULER_add_now (&do_shutdown, test_ctx);
+  GNUNET_free_non_null (emsg);
 }
 
 
@@ -129,13 +130,14 @@ int main (int argc, char *argv[])
     GNUNET_GETOPT_OPTION_END
   };
 
+  status = GNUNET_SYSERR;
   if (GNUNET_OK !=
       GNUNET_PROGRAM_run (argc, argv,
                           "test_testing_new_peerstartup",
                           "test case for peerstartup using new testing library",
                           options, &run, NULL))
     return 1;
-  return 0;
+  return (GNUNET_OK == status) ? 0 : 1;
 }
 
 /* end of test_testing_peerstartup.c */