#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
*/
uint16_t old_port1;
system = GNUNET_TESTING_system_create ("/tmp/gnunet-testing-new",
- "localhost");
+ "localhost", NULL, NULL);
GNUNET_assert (NULL != system);
- new_port1 = GNUNET_TESTING_reserve_port (system, GNUNET_YES);
+ new_port1 = GNUNET_TESTING_reserve_port (system);
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Reserved TCP port %u\n", new_port1);
- GNUNET_assert (0 != new_port1);
- new_port2 = GNUNET_TESTING_reserve_port (system, GNUNET_YES);
+ if (0 == new_port1)
+ goto end;
+ new_port2 = GNUNET_TESTING_reserve_port (system);
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);
+ GNUNET_TESTING_release_port (system, new_port1);
old_port1 = new_port1;
new_port1 = 0;
- new_port1 = GNUNET_TESTING_reserve_port (system, GNUNET_YES);
+ new_port1 = GNUNET_TESTING_reserve_port (system);
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Reserved TCP port %u\n", new_port1);
GNUNET_assert (0 != new_port1);
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);
+ GNUNET_TESTING_release_port (system, new_port1);
+ GNUNET_TESTING_release_port (system, new_port2);
+ status = GNUNET_OK;
+
+ end:
+ GNUNET_TESTING_system_destroy (system, GNUNET_YES);
}
struct GNUNET_GETOPT_CommandLineOption options[] = {
GNUNET_GETOPT_OPTION_END
};
+
+ status = GNUNET_SYSERR;
if (GNUNET_OK !=
GNUNET_PROGRAM_run (argc,
argv,
options,
&run,
NULL))
- {
return 1;
- }
- return 0;
+ return (GNUNET_OK == status) ? 0 : 1;
}
/* end of test_testing_portreservation.c */