summaryrefslogtreecommitdiff
path: root/src/testbed/testbed_api_test.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/testbed/testbed_api_test.c')
-rw-r--r--src/testbed/testbed_api_test.c49
1 files changed, 25 insertions, 24 deletions
diff --git a/src/testbed/testbed_api_test.c b/src/testbed/testbed_api_test.c
index 7294a137e..5b57826ba 100644
--- a/src/testbed/testbed_api_test.c
+++ b/src/testbed/testbed_api_test.c
@@ -31,7 +31,8 @@
31/** 31/**
32 * Context information for test run 32 * Context information for test run
33 */ 33 */
34struct TestRunContext { 34struct TestRunContext
35{
35 /** 36 /**
36 * Test master callback 37 * Test master callback
37 */ 38 */
@@ -73,13 +74,13 @@ struct TestRunContext {
73 * @param config the configuration file handle 74 * @param config the configuration file handle
74 */ 75 */
75static void 76static void
76run(void *cls, char *const *args, const char *cfgfile, 77run (void *cls, char *const *args, const char *cfgfile,
77 const struct GNUNET_CONFIGURATION_Handle *config) 78 const struct GNUNET_CONFIGURATION_Handle *config)
78{ 79{
79 struct TestRunContext *rc = cls; 80 struct TestRunContext *rc = cls;
80 81
81 GNUNET_TESTBED_run(NULL, config, rc->num_peers, rc->event_mask, rc->cc, 82 GNUNET_TESTBED_run (NULL, config, rc->num_peers, rc->event_mask, rc->cc,
82 rc->cc_cls, rc->test_master, rc->test_master_cls); 83 rc->cc_cls, rc->test_master, rc->test_master_cls);
83} 84}
84 85
85 86
@@ -117,14 +118,14 @@ run(void *cls, char *const *args, const char *cfgfile,
117 * @return #GNUNET_SYSERR on error, #GNUNET_OK on success 118 * @return #GNUNET_SYSERR on error, #GNUNET_OK on success
118 */ 119 */
119int 120int
120GNUNET_TESTBED_test_run(const char *testname, 121GNUNET_TESTBED_test_run (const char *testname,
121 const char *cfg_filename, 122 const char *cfg_filename,
122 unsigned int num_peers, 123 unsigned int num_peers,
123 uint64_t event_mask, 124 uint64_t event_mask,
124 GNUNET_TESTBED_ControllerCallback cc, 125 GNUNET_TESTBED_ControllerCallback cc,
125 void *cc_cls, 126 void *cc_cls,
126 GNUNET_TESTBED_TestMaster test_master, 127 GNUNET_TESTBED_TestMaster test_master,
127 void *test_master_cls) 128 void *test_master_cls)
128{ 129{
129 char *argv2[] = { 130 char *argv2[] = {
130 NULL, 131 NULL,
@@ -138,23 +139,23 @@ GNUNET_TESTBED_test_run(const char *testname,
138 struct TestRunContext *rc; 139 struct TestRunContext *rc;
139 int ret; 140 int ret;
140 141
141 argv2[0] = GNUNET_strdup(testname); 142 argv2[0] = GNUNET_strdup (testname);
142 argv2[2] = GNUNET_strdup(cfg_filename); 143 argv2[2] = GNUNET_strdup (cfg_filename);
143 GNUNET_assert(NULL != test_master); 144 GNUNET_assert (NULL != test_master);
144 GNUNET_assert(num_peers > 0); 145 GNUNET_assert (num_peers > 0);
145 rc = GNUNET_malloc(sizeof(struct TestRunContext) + 146 rc = GNUNET_malloc (sizeof(struct TestRunContext)
146 (num_peers * sizeof(struct GNUNET_TESTBED_Peer *))); 147 + (num_peers * sizeof(struct GNUNET_TESTBED_Peer *)));
147 rc->test_master = test_master; 148 rc->test_master = test_master;
148 rc->test_master_cls = test_master_cls; 149 rc->test_master_cls = test_master_cls;
149 rc->num_peers = num_peers; 150 rc->num_peers = num_peers;
150 rc->event_mask = event_mask; 151 rc->event_mask = event_mask;
151 rc->cc = cc; 152 rc->cc = cc;
152 rc->cc_cls = cc_cls; 153 rc->cc_cls = cc_cls;
153 ret = GNUNET_PROGRAM_run((sizeof(argv2) / sizeof(char *)) - 1, argv2, 154 ret = GNUNET_PROGRAM_run ((sizeof(argv2) / sizeof(char *)) - 1, argv2,
154 testname, "nohelp", options, &run, rc); 155 testname, "nohelp", options, &run, rc);
155 GNUNET_free(rc); 156 GNUNET_free (rc);
156 GNUNET_free(argv2[0]); 157 GNUNET_free (argv2[0]);
157 GNUNET_free(argv2[2]); 158 GNUNET_free (argv2[2]);
158 return ret; 159 return ret;
159} 160}
160 161