Forget to commit some files

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

diff --git a/src/testbed/test_testbed_api_test.c b/src/testbed/test_testbed_api_test.c
index 91c6fe637a0fa8459a56f2425ccc5e97929d44e3..f4e80ab6f87f6f6291c42318fdb38e1e97fd4357 100644 (file)
--- a/src/testbed/test_testbed_api_test.c
+++ b/src/testbed/test_testbed_api_test.c
@@ -1,6 +1,6 @@
 /*
   This file is part of GNUnet
-  (C) 2008--2012 Christian Grothoff (and other contributing authors)
+  Copyright (C) 2008--2013 Christian Grothoff (and other contributing authors)
 
   GNUnet is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published
@@ -14,8 +14,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
 */
 
 /**
@@ -25,7 +25,7 @@
  */
 
 #include "platform.h"
-#include "gnunet_common.h"
+#include "gnunet_util_lib.h"
 #include "gnunet_testbed_service.h"
 
 
@@ -38,7 +38,7 @@
 /**
  * Number of peers we want to start
  */
-#define NUM_PEERS 25
+#define NUM_PEERS 2
 
 /**
  * Array of peers
@@ -53,12 +53,12 @@ static struct GNUNET_TESTBED_Operation *op;
 /**
  * Abort task identifier
  */
-static GNUNET_SCHEDULER_TaskIdentifier abort_task;
+static struct GNUNET_SCHEDULER_Task * abort_task;
 
 /**
  * shutdown task identifier
  */
-static GNUNET_SCHEDULER_TaskIdentifier shutdown_task;
+static struct GNUNET_SCHEDULER_Task * shutdown_task;
 
 /**
  * Testing result
@@ -75,8 +75,8 @@ static int result;
 static void
 do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  shutdown_task = GNUNET_SCHEDULER_NO_TASK;
-  if (GNUNET_SCHEDULER_NO_TASK != abort_task)
+  shutdown_task = NULL;
+  if (NULL != abort_task)
     GNUNET_SCHEDULER_cancel (abort_task);
   if (NULL != op)
     GNUNET_TESTBED_operation_done (op);
@@ -89,10 +89,10 @@ do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 #define FAIL_TEST(cond) do {                                            \
     if (!(cond)) {                                                      \
       GNUNET_break(0);                                                  \
-      if (GNUNET_SCHEDULER_NO_TASK != abort_task)                       \
+      if (NULL != abort_task)                       \
         GNUNET_SCHEDULER_cancel (abort_task);                           \
-      abort_task = GNUNET_SCHEDULER_NO_TASK;                            \
-      if (GNUNET_SCHEDULER_NO_TASK == shutdown_task)                    \
+      abort_task = NULL;                            \
+      if (NULL == shutdown_task)                    \
         shutdown_task = GNUNET_SCHEDULER_add_now (do_shutdown, NULL);   \
       return;                                                           \
     }                                                                   \
@@ -109,8 +109,8 @@ static void
 do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   LOG (GNUNET_ERROR_TYPE_WARNING, "Test timedout -- Aborting\n");
-  abort_task = GNUNET_SCHEDULER_NO_TASK;
-  if (GNUNET_SCHEDULER_NO_TASK != shutdown_task)
+  abort_task = NULL;
+  if (NULL != shutdown_task)
     GNUNET_SCHEDULER_cancel (shutdown_task);
   do_shutdown (cls, tc);
 }
@@ -193,6 +193,7 @@ controller_event_cb (void *cls,
  * Signature of a main function for a testcase.
  *
  * @param cls closure
+ * @param h the run handle
  * @param num_peers number of peers in 'peers'
  * @param peers- handle to peers run in the testbed
  * @param links_succeeded the number of overlay link connection attempts that
@@ -201,7 +202,9 @@ controller_event_cb (void *cls,
  *          failed
  */
 static void
-test_master (void *cls, unsigned int num_peers,
+test_master (void *cls,
+             struct GNUNET_TESTBED_RunHandle *h,
+             unsigned int num_peers,
              struct GNUNET_TESTBED_Peer **peers_,
              unsigned int links_succeeded,
              unsigned int links_failed)