- simple test without sending. peers setup working.

5 files changed, 16 insertions, 5 deletions

diff --git a/src/testbed/Makefile.am b/src/testbed/Makefile.am
index c1d89607c..347d16007 100644
--- a/src/testbed/Makefile.am
+++ b/src/testbed/Makefile.am
@@ -102,6 +102,8 @@ gnunet_cmds_helper_SOURCES = \
 gnunet_cmds_helper_LDADD = $(XLIB) \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/transport/libgnunettransporttesting2.la \
+ libgnunettestbed.la \
  $(LTLIBINTL) $(Z_LIBS)
 
 gnunet_daemon_testbed_blacklist_SOURCES = gnunet-daemon-testbed-blacklist.c
diff --git a/src/testbed/gnunet-cmds-helper.c b/src/testbed/gnunet-cmds-helper.c
index 113e3c386..c4a3e98d9 100644
--- a/src/testbed/gnunet-cmds-helper.c
+++ b/src/testbed/gnunet-cmds-helper.c
@@ -411,7 +411,7 @@ tokenizer_cb (void *cls, const struct GNUNET_MessageHeader *message)
     plugin = GNUNET_new (struct Plugin);
     plugin->api = GNUNET_PLUGIN_load (plugin_name,
                                       NULL);
-    plugin->library_name = GNUNET_strdup (plugin_name);
+    plugin->library_name = GNUNET_strdup (basename(plugin_name));
 
     plugin->global_n = ni->global_n;
     plugin->local_m = ni->local_m;
diff --git a/src/testbed/testbed_api.h b/src/testbed/testbed_api.h
index 9a54ca36c..67aa6dc1c 100644
--- a/src/testbed/testbed_api.h
+++ b/src/testbed/testbed_api.h
@@ -40,7 +40,7 @@
 /**
  * Cmds Helper binary name
  */
-#define HELPER_CMDS_BINARY "gnunet-cmds-helper"
+#define HELPER_CMDS_BINARY "./../testbed/gnunet-cmds-helper"
 
 
 /**
diff --git a/src/testbed/testbed_api_cmd_local_test_finished.c b/src/testbed/testbed_api_cmd_local_test_finished.c
index 8829f1b9a..b5f4b8b31 100644
--- a/src/testbed/testbed_api_cmd_local_test_finished.c
+++ b/src/testbed/testbed_api_cmd_local_test_finished.c
@@ -93,6 +93,8 @@ local_test_finished_finish (void *cls,
                             void *cont_cls)
 {
   // This will stop the local loop without shutting down the scheduler, because we do not call the continuation, which is the interpreter_next method.
+  LOG (GNUNET_ERROR_TYPE_ERROR,
+       "Stopping local loop\n");
   return GNUNET_YES;
 }
 
diff --git a/src/testbed/testbed_api_cmd_netjail_start_testbed.c b/src/testbed/testbed_api_cmd_netjail_start_testbed.c
index 67f0ef55c..de3926696 100644
--- a/src/testbed/testbed_api_cmd_netjail_start_testbed.c
+++ b/src/testbed/testbed_api_cmd_netjail_start_testbed.c
@@ -328,8 +328,7 @@ start_testbed (struct NetJailState *ns, struct
   char *const script_argv[] = {NETJAIL_EXEC_SCRIPT,
                                m_char,
                                n_char,
-                               GNUNET_OS_get_libexec_binary_path (
-                                 HELPER_CMDS_BINARY),
+                               HELPER_CMDS_BINARY,
                                ns->global_n,
                                ns->local_m,
                                NULL};
@@ -373,6 +372,9 @@ start_testbed (struct NetJailState *ns, struct
                          &exp_cb,
                          tbc));
 
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                    "First using helper %d\n",
+                    tbc->count - 1);
   struct GNUNET_HELPER_Handle *helper = ns->helper[tbc->count - 1];
 
   msg = create_helper_init_msg_ (m_char,
@@ -469,7 +471,12 @@ netjail_start_finish (void *cls,
         tbc = GNUNET_new (struct TestbedCount);
         tbc->ns = ns;
         // TODO This needs to be more generic. As we send more messages back and forth, we can not grow the arrays again and again, because this is to error prone.
-        tbc->count = (j - 1) * atoi (ns->local_m) + i + total_number;
+        tbc->count = (i - 1) * atoi (ns->local_m) + j + total_number;
+        GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                    "Second using helper %d %d %d\n",
+                    tbc->count - 1 - total_number,
+                    i,
+                    j);
         helper = ns->helper[tbc->count - 1 - total_number];
         msg_length = sizeof(struct GNUNET_CMDS_ALL_PEERS_STARTED);
         reply = GNUNET_new (struct GNUNET_CMDS_ALL_PEERS_STARTED);