LRN: Here's a patch. See if it doesn't break anything for you.

[oweals/gnunet.git] / src / nat / test_nat_test.c

diff --git a/src/nat/test_nat_test.c b/src/nat/test_nat_test.c
index 520d82d92980a583454e92df0bb739e06b2c871b..c213ffa1e695e914760499f6d629d416ac33c14b 100644 (file)
--- a/src/nat/test_nat_test.c
+++ b/src/nat/test_nat_test.c
@@ -30,12 +30,8 @@
 #include "gnunet_util_lib.h"
 #include "gnunet_nat_lib.h"
 
-
-#define VERBOSE GNUNET_NO
-
-
 /**
- * Time to wait before stopping NAT test, in seconds 
+ * Time to wait before stopping NAT test, in seconds
  */
 #define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 15)
 
@@ -65,12 +61,12 @@ report_success (void *cls, int success)
  * Main function run with scheduler.
  */
 static void
-run (void *cls,
-     char *const *args,
-     const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *cfg)
+run (void *cls, char *const *args, const char *cfgfile,
+     const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
-  tst = GNUNET_NAT_test_start (cfg, GNUNET_YES,
-                               1285, 1285, &report_success, NULL);
+  tst =
+      GNUNET_NAT_test_start (cfg, GNUNET_YES, 1285, 1285, &report_success,
+                             NULL);
   if (NULL == tst)
     return;
   end = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_test, NULL);
@@ -84,40 +80,39 @@ main (int argc, char *const argv[])
     GNUNET_GETOPT_OPTION_END
   };
   struct GNUNET_OS_Process *gns;
-
+  int nat_res;
   char *const argv_prog[] = {
     "test-nat-test",
     "-c",
     "test_nat_test_data.conf",
-    "-L",
-#if VERBOSE
-    "DEBUG",
-#else
-    "WARNING",
-#endif
     NULL
   };
 
   GNUNET_log_setup ("test-nat-test",
-#if VERBOSE
-                    "DEBUG",
-#else
                     "WARNING",
-#endif
                     NULL);
-  gns = GNUNET_OS_start_process (NULL, NULL,
-                                 "gnunet-nat-server", "gnunet-nat-server",
-#if VERBOSE
-                                 "-L", "DEBUG",
-#endif
-                                 "-c", "test_nat_test_data.conf",
-                                 "12345", NULL);
+
+  nat_res = GNUNET_OS_check_helper_binary ("gnunet-nat-server");
+  if (GNUNET_SYSERR == nat_res)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                "Cannot run NAT test: `%s' file not found\n",
+                "gnunet-nat-server");
+    return 0;
+  }
+
+  gns =
+      GNUNET_OS_start_process (GNUNET_YES, GNUNET_OS_INHERIT_STD_OUT_AND_ERR, NULL, NULL, "gnunet-nat-server",
+                               "gnunet-nat-server",
+                               "-c", "test_nat_test_data.conf", "12345", NULL);
   GNUNET_assert (NULL != gns);
-  GNUNET_PROGRAM_run (5, argv_prog,
-                      "test-nat-test", "nohelp", options, &run, NULL);
+  GNUNET_PROGRAM_run (3, argv_prog, "test-nat-test", "nohelp", options, &run,
+                      NULL);
   GNUNET_break (0 == GNUNET_OS_process_kill (gns, SIGTERM));
   GNUNET_break (GNUNET_OK == GNUNET_OS_process_wait (gns));
-  GNUNET_OS_process_close (gns);
+  GNUNET_OS_process_destroy (gns);
+  if (0 != ret)
+    fprintf (stderr, "NAT test failed to report success\n");
   return ret;
 }