-add adv port

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

diff --git a/src/testing/test_testing_portreservation.c b/src/testing/test_testing_portreservation.c
index 02d6e168674cd94d99779ff13c60b98c23ae0a06..98690fc1c384be167551d1c9743e7935626a0fdb 100644 (file)
--- a/src/testing/test_testing_portreservation.c
+++ b/src/testing/test_testing_portreservation.c
@@ -32,6 +32,11 @@
 #define LOG(kind,...) \
   GNUNET_log (kind, __VA_ARGS__)
 
+/**
+ * The status of the test
+ */
+int status;
+
 /**
  * Main point of test execution
  */
@@ -45,16 +50,18 @@ run (void *cls, char *const *args, const char *cfgfile,
   uint16_t old_port1;
 
   system = GNUNET_TESTING_system_create ("/tmp/gnunet-testing-new",
-                                         "localhost");
+                                         "localhost", NULL);
   GNUNET_assert (NULL != system);
   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,7 +73,10 @@ 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);
-  GNUNET_TESTING_system_destroy (system, GNUNET_NO);
+  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,8 +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 */