- indent

[oweals/gnunet.git] / src / testbed / test_testbed_api_testbed_run.c

diff --git a/src/testbed/test_testbed_api_testbed_run.c b/src/testbed/test_testbed_api_testbed_run.c
index d39cae804022833705e8ea30c57d1c3f2b09b19f..9cad74a7b37565f1c3da84ca525884475a18a01c 100644 (file)
--- a/src/testbed/test_testbed_api_testbed_run.c
+++ b/src/testbed/test_testbed_api_testbed_run.c
@@ -31,7 +31,7 @@
 /**
  * Number of peers we want to start
  */
-#define NUM_PEERS 13
+#define NUM_PEERS 5
 
 /**
  * The array of peers; we fill this as the peers are given to us by the testbed
@@ -70,7 +70,7 @@ do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   if (GNUNET_SCHEDULER_NO_TASK != abort_task)
     GNUNET_SCHEDULER_cancel (abort_task);
-  GNUNET_SCHEDULER_shutdown ();        /* Stop scheduler to shutdown testbed run */
+  GNUNET_SCHEDULER_shutdown (); /* Stop scheduler to shutdown testbed run */
 }
 
 
@@ -90,13 +90,15 @@ do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 
 
 /**
- * Task to be executed when peers are ready
+ * Signature of a main function for a testcase.
  *
- * @param cls NULL
- * @param tc the task context
+ * @param cls closure
+ * @param num_peers number of peers in 'peers'
+ * @param peers handle to peers run in the testbed
  */
 static void
-master_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+test_master (void *cls, unsigned int num_peers,
+             struct GNUNET_TESTBED_Peer **peers_)
 {
   result = GNUNET_OK;
   GNUNET_assert (NULL != peers[0]);
@@ -153,10 +155,10 @@ run (void *cls, char *const *args, const char *cfgfile,
   event_mask |= (1LL << GNUNET_TESTBED_ET_PEER_START);
   event_mask |= (1LL << GNUNET_TESTBED_ET_PEER_STOP);
   GNUNET_TESTBED_run (NULL, config, NUM_PEERS, event_mask, &controller_event_cb,
-                      NULL, &master_task, NULL);
+                      NULL, &test_master, NULL);
   abort_task =
       GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
-                                    (GNUNET_TIME_UNIT_SECONDS, 60), &do_abort,
+                                    (GNUNET_TIME_UNIT_SECONDS, 300), &do_abort,
                                     NULL);
 }
 
@@ -179,20 +181,33 @@ main (int argc, char **argv)
   char *config_filename;
   int ret;
 
-  testname = rindex (argv[0], (int) '_');
-  testname++;
-  if (NULL == testname)
+  if (NULL == (testname = strrchr (argv[0], (int) '_')))
   {
     GNUNET_break (0);
     return 1;
   }
+  testname++;
+  testname = GNUNET_strdup (testname);
+#ifdef MINGW
+  {
+    char *period;
+
+    /* check and remove .exe extension */
+    period = strrchr (testname, (int) '.');
+    if (NULL != period)
+      *period = '\0';
+    else
+      GNUNET_break (0);         /* Windows with no .exe? */
+  }
+#endif
   if (0 != strcmp ("run", testname))
   {
-    GNUNET_asprintf (&config_filename, 
-                     "test_testbed_api_testbed_run_%s.conf", testname);
+    GNUNET_asprintf (&config_filename, "test_testbed_api_testbed_run_%s.conf",
+                     testname);
   }
   else
     config_filename = GNUNET_strdup ("test_testbed_api.conf");
+  GNUNET_free (testname);
   argv2[2] = config_filename;
   result = GNUNET_SYSERR;
   ret =