diff options
Diffstat (limited to 'src/testing/test_testing_group.c')
-rw-r--r-- | src/testing/test_testing_group.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/src/testing/test_testing_group.c b/src/testing/test_testing_group.c index 88893f45d..f5df45b19 100644 --- a/src/testing/test_testing_group.c +++ b/src/testing/test_testing_group.c | |||
@@ -65,8 +65,7 @@ shutdown_callback (void *cls, const char *emsg) | |||
65 | 65 | ||
66 | 66 | ||
67 | static void | 67 | static void |
68 | my_cb (void *cls, | 68 | my_cb (void *cls, const struct GNUNET_PeerIdentity *id, |
69 | const struct GNUNET_PeerIdentity *id, | ||
70 | const struct GNUNET_CONFIGURATION_Handle *cfg, | 69 | const struct GNUNET_CONFIGURATION_Handle *cfg, |
71 | struct GNUNET_TESTING_Daemon *d, const char *emsg) | 70 | struct GNUNET_TESTING_Daemon *d, const char *emsg) |
72 | { | 71 | { |
@@ -105,9 +104,8 @@ my_cb (void *cls, | |||
105 | 104 | ||
106 | 105 | ||
107 | static void | 106 | static void |
108 | run (void *cls, | 107 | run (void *cls, char *const *args, const char *cfgfile, |
109 | char *const *args, | 108 | const struct GNUNET_CONFIGURATION_Handle *cfg) |
110 | const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *cfg) | ||
111 | { | 109 | { |
112 | ok = 1; | 110 | ok = 1; |
113 | #if VERBOSE | 111 | #if VERBOSE |
@@ -117,9 +115,8 @@ run (void *cls, | |||
117 | pg = GNUNET_TESTING_daemons_start (cfg, peers_left, /* Total number of peers */ | 115 | pg = GNUNET_TESTING_daemons_start (cfg, peers_left, /* Total number of peers */ |
118 | peers_left, /* Number of outstanding connections */ | 116 | peers_left, /* Number of outstanding connections */ |
119 | peers_left, /* Number of parallel ssh connections, or peers being started at once */ | 117 | peers_left, /* Number of parallel ssh connections, or peers being started at once */ |
120 | TIMEOUT, | 118 | TIMEOUT, NULL, NULL, &my_cb, NULL, NULL, |
121 | NULL, NULL, | 119 | NULL, NULL); |
122 | &my_cb, NULL, NULL, NULL, NULL); | ||
123 | GNUNET_assert (pg != NULL); | 120 | GNUNET_assert (pg != NULL); |
124 | } | 121 | } |
125 | 122 | ||
@@ -137,8 +134,8 @@ check () | |||
137 | struct GNUNET_GETOPT_CommandLineOption options[] = { | 134 | struct GNUNET_GETOPT_CommandLineOption options[] = { |
138 | GNUNET_GETOPT_OPTION_END | 135 | GNUNET_GETOPT_OPTION_END |
139 | }; | 136 | }; |
140 | GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, | 137 | GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, argv, |
141 | argv, "test-testing-group", "nohelp", options, &run, &ok); | 138 | "test-testing-group", "nohelp", options, &run, &ok); |
142 | return ok; | 139 | return ok; |
143 | } | 140 | } |
144 | 141 | ||