aboutsummaryrefslogtreecommitdiff
path: root/src/testbed/testbed_api_test.c
diff options
context:
space:
mode:
authorSree Harsha Totakura <totakura@in.tum.de>2013-01-25 15:28:08 +0000
committerSree Harsha Totakura <totakura@in.tum.de>2013-01-25 15:28:08 +0000
commit30c5c323f28ade8a1e7c6c593778793e44accb3a (patch)
tree845955ec895d221338b44f0cadce7932932e78cc /src/testbed/testbed_api_test.c
parent43d558efd13a3245e65efd0acdc9c4ba59cd2bee (diff)
downloadgnunet-30c5c323f28ade8a1e7c6c593778793e44accb3a.tar.gz
gnunet-30c5c323f28ade8a1e7c6c593778793e44accb3a.zip
- indent
Diffstat (limited to 'src/testbed/testbed_api_test.c')
-rw-r--r--src/testbed/testbed_api_test.c17
1 files changed, 8 insertions, 9 deletions
diff --git a/src/testbed/testbed_api_test.c b/src/testbed/testbed_api_test.c
index 834f23c76..af91cec65 100644
--- a/src/testbed/testbed_api_test.c
+++ b/src/testbed/testbed_api_test.c
@@ -52,7 +52,7 @@ struct TestRunContext
52 * Closure for the above callback 52 * Closure for the above callback
53 */ 53 */
54 void *cc_cls; 54 void *cc_cls;
55 55
56 /** 56 /**
57 * event mask for the controller callback 57 * event mask for the controller callback
58 */ 58 */
@@ -79,8 +79,8 @@ run (void *cls, char *const *args, const char *cfgfile,
79{ 79{
80 struct TestRunContext *rc = cls; 80 struct TestRunContext *rc = cls;
81 81
82 GNUNET_TESTBED_run (NULL, config, rc->num_peers, rc->event_mask, 82 GNUNET_TESTBED_run (NULL, config, rc->num_peers, rc->event_mask, rc->cc,
83 rc->cc, rc->cc_cls, rc->test_master, rc->test_master_cls); 83 rc->cc_cls, rc->test_master, rc->test_master_cls);
84} 84}
85 85
86 86
@@ -119,10 +119,8 @@ run (void *cls, char *const *args, const char *cfgfile,
119 */ 119 */
120int 120int
121GNUNET_TESTBED_test_run (const char *testname, const char *cfg_filename, 121GNUNET_TESTBED_test_run (const char *testname, const char *cfg_filename,
122 unsigned int num_peers, 122 unsigned int num_peers, uint64_t event_mask,
123 uint64_t event_mask, 123 GNUNET_TESTBED_ControllerCallback cc, void *cc_cls,
124 GNUNET_TESTBED_ControllerCallback cc,
125 void *cc_cls,
126 GNUNET_TESTBED_TestMaster test_master, 124 GNUNET_TESTBED_TestMaster test_master,
127 void *test_master_cls) 125 void *test_master_cls)
128{ 126{
@@ -150,8 +148,9 @@ GNUNET_TESTBED_test_run (const char *testname, const char *cfg_filename,
150 rc->event_mask = event_mask; 148 rc->event_mask = event_mask;
151 rc->cc = cc; 149 rc->cc = cc;
152 rc->cc_cls = cc_cls; 150 rc->cc_cls = cc_cls;
153 ret = GNUNET_PROGRAM_run ((sizeof (argv2) / sizeof (char *)) - 1, argv2, 151 ret =
154 testname, "nohelp", options, &run, rc); 152 GNUNET_PROGRAM_run ((sizeof (argv2) / sizeof (char *)) - 1, argv2,
153 testname, "nohelp", options, &run, rc);
155 GNUNET_free (rc); 154 GNUNET_free (rc);
156 GNUNET_free (argv2[0]); 155 GNUNET_free (argv2[0]);
157 GNUNET_free (argv2[2]); 156 GNUNET_free (argv2[2]);