X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Ftesting%2Ftest_testing_portreservation.c;h=21ef51ffda53e247af03802fcc09a452805bfbb9;hb=6973ade884b8e22e7fcaa51a90d00a8caa2d2fa4;hp=6640316331d562a0b0bcf260baa843aef9481cb1;hpb=87566df009e48391b08d3f1cdf3dedf7debcac7b;p=oweals%2Fgnunet.git

diff --git a/src/testing/test_testing_portreservation.c b/src/testing/test_testing_portreservation.c
index 664031633..21ef51ffd 100644
--- a/src/testing/test_testing_portreservation.c
+++ b/src/testing/test_testing_portreservation.c
@@ -27,11 +27,16 @@
 
 #include "platform.h"
 #include "gnunet_util_lib.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
 
 #define LOG(kind,...) \
   GNUNET_log (kind, __VA_ARGS__)
 
+/**
+ * The status of the test
+ */
+int status;
+
 /**
  * Main point of test execution
  */
@@ -50,11 +55,13 @@ run (void *cls, char *const *args, const char *cfgfile,
   new_port1 = GNUNET_TESTING_reserve_port (system, GNUNET_YES);
   LOG (GNUNET_ERROR_TYPE_DEBUG,
                 "Reserved TCP port %u\n", new_port1);
-  GNUNET_assert (0 != new_port1);
+  if (0 == new_port1)
+    goto end;
   new_port2 = GNUNET_TESTING_reserve_port (system, GNUNET_YES);
   LOG (GNUNET_ERROR_TYPE_DEBUG,
                 "Reserved TCP port %u\n", new_port2);
-  GNUNET_assert (0 != new_port2);
+  if (0 == new_port2)
+    goto end;
   GNUNET_assert (new_port1 != new_port2);
   GNUNET_TESTING_release_port (system, GNUNET_YES, new_port1);
   old_port1 = new_port1;
@@ -66,6 +73,9 @@ run (void *cls, char *const *args, const char *cfgfile,
   GNUNET_assert (old_port1 == new_port1);
   GNUNET_TESTING_release_port (system, GNUNET_YES, new_port1);
   GNUNET_TESTING_release_port (system, GNUNET_YES, new_port2);
+  status = GNUNET_OK;
+
+ end:
   GNUNET_TESTING_system_destroy (system, GNUNET_YES);
 }
 
@@ -75,6 +85,8 @@ int main (int argc, char *argv[])
   struct GNUNET_GETOPT_CommandLineOption options[] = {
     GNUNET_GETOPT_OPTION_END
   };
+
+  status = GNUNET_SYSERR;
   if (GNUNET_OK !=
       GNUNET_PROGRAM_run (argc,
                           argv,
@@ -84,10 +96,8 @@ int main (int argc, char *argv[])
                           options,
                           &run,
                           NULL))
-  {
     return 1;
-  }
-  return 0;
+  return (GNUNET_OK == status) ? 0 : 1;
 }
 
 /* end of test_testing_portreservation.c */