diff options
Diffstat (limited to 'src/testbed/plugin_testcmd.c')
-rw-r--r-- | src/testbed/plugin_testcmd.c | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/src/testbed/plugin_testcmd.c b/src/testbed/plugin_testcmd.c index 6f28e102d..70b6ad3ae 100644 --- a/src/testbed/plugin_testcmd.c +++ b/src/testbed/plugin_testcmd.c | |||
@@ -28,12 +28,20 @@ | |||
28 | #include "gnunet_util_lib.h" | 28 | #include "gnunet_util_lib.h" |
29 | #include "gnunet_testbed_ng_service.h" | 29 | #include "gnunet_testbed_ng_service.h" |
30 | 30 | ||
31 | /** | ||
32 | * Generic logging shortcut | ||
33 | */ | ||
34 | #define LOG(kind, ...) GNUNET_log (kind, __VA_ARGS__) | ||
35 | |||
31 | unsigned int are_all_peers_started; | 36 | unsigned int are_all_peers_started; |
32 | 37 | ||
33 | static void | 38 | static void |
34 | all_peers_started () | 39 | all_peers_started () |
35 | { | 40 | { |
36 | are_all_peers_started = GNUNET_YES; | 41 | are_all_peers_started = GNUNET_YES; |
42 | LOG (GNUNET_ERROR_TYPE_ERROR, | ||
43 | "setting are_all_peers_started: %d\n", | ||
44 | are_all_peers_started); | ||
37 | } | 45 | } |
38 | 46 | ||
39 | static void | 47 | static void |
@@ -42,6 +50,9 @@ start_testcase (TESTBED_CMD_HELPER_write_cb write_message, char *router_ip, | |||
42 | { | 50 | { |
43 | struct GNUNET_TIME_Absolute now = GNUNET_TIME_absolute_get (); | 51 | struct GNUNET_TIME_Absolute now = GNUNET_TIME_absolute_get (); |
44 | 52 | ||
53 | LOG (GNUNET_ERROR_TYPE_ERROR, | ||
54 | "We got here 6!\n"); | ||
55 | |||
45 | are_all_peers_started = GNUNET_NO; | 56 | are_all_peers_started = GNUNET_NO; |
46 | 57 | ||
47 | struct GNUNET_TESTING_Command commands[] = { | 58 | struct GNUNET_TESTING_Command commands[] = { |
@@ -52,12 +63,15 @@ start_testcase (TESTBED_CMD_HELPER_write_cb write_message, char *router_ip, | |||
52 | write_message), | 63 | write_message), |
53 | GNUNET_TESTING_cmd_block_until_all_peers_started ("block-1", | 64 | GNUNET_TESTING_cmd_block_until_all_peers_started ("block-1", |
54 | &are_all_peers_started), | 65 | &are_all_peers_started), |
55 | GNUNET_TESTING_cmd_end () | 66 | GNUNET_TESTING_cmd_local_test_finished ("local-test-finished-1", |
67 | write_message) | ||
56 | }; | 68 | }; |
57 | 69 | ||
58 | GNUNET_TESTING_run (NULL, | 70 | GNUNET_TESTING_run (NULL, |
59 | commands, | 71 | commands, |
60 | GNUNET_TIME_UNIT_FOREVER_REL); | 72 | GNUNET_TIME_UNIT_FOREVER_REL); |
73 | LOG (GNUNET_ERROR_TYPE_ERROR, | ||
74 | "We got here 7!\n"); | ||
61 | 75 | ||
62 | } | 76 | } |
63 | 77 | ||
@@ -75,6 +89,7 @@ libgnunet_plugin_testcmd_init (void *cls) | |||
75 | 89 | ||
76 | api = GNUNET_new (struct GNUNET_TESTING_PluginFunctions); | 90 | api = GNUNET_new (struct GNUNET_TESTING_PluginFunctions); |
77 | api->start_testcase = &start_testcase; | 91 | api->start_testcase = &start_testcase; |
92 | api->all_peers_started = &all_peers_started; | ||
78 | return api; | 93 | return api; |
79 | } | 94 | } |
80 | 95 | ||