X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Ftestbed%2Ftestbed_api_test.c;h=f52877ceee1a98e2c7c1ae9394cbff1f29bf5775;hb=0778d7e951b20f42af01597ae41ba8d2d26857d0;hp=834f23c76b75540c6a2d4fd03efca5540def65ca;hpb=317a32c0cd8040dc14c574a50fe2bfd43da19c93;p=oweals%2Fgnunet.git diff --git a/src/testbed/testbed_api_test.c b/src/testbed/testbed_api_test.c index 834f23c76..f52877cee 100644 --- a/src/testbed/testbed_api_test.c +++ b/src/testbed/testbed_api_test.c @@ -1,6 +1,6 @@ /* This file is part of GNUnet - (C) 2008--2012 Christian Grothoff (and other contributing authors) + (C) 2008--2013 Christian Grothoff (and other contributing authors) GNUnet is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published @@ -52,7 +52,7 @@ struct TestRunContext * Closure for the above callback */ void *cc_cls; - + /** * event mask for the controller callback */ @@ -79,8 +79,8 @@ run (void *cls, char *const *args, const char *cfgfile, { struct TestRunContext *rc = cls; - GNUNET_TESTBED_run (NULL, config, rc->num_peers, rc->event_mask, - rc->cc, rc->cc_cls, rc->test_master, rc->test_master_cls); + GNUNET_TESTBED_run (NULL, config, rc->num_peers, rc->event_mask, rc->cc, + rc->cc_cls, rc->test_master, rc->test_master_cls); } @@ -119,10 +119,8 @@ run (void *cls, char *const *args, const char *cfgfile, */ int GNUNET_TESTBED_test_run (const char *testname, const char *cfg_filename, - unsigned int num_peers, - uint64_t event_mask, - GNUNET_TESTBED_ControllerCallback cc, - void *cc_cls, + unsigned int num_peers, uint64_t event_mask, + GNUNET_TESTBED_ControllerCallback cc, void *cc_cls, GNUNET_TESTBED_TestMaster test_master, void *test_master_cls) { @@ -150,8 +148,9 @@ GNUNET_TESTBED_test_run (const char *testname, const char *cfg_filename, rc->event_mask = event_mask; rc->cc = cc; rc->cc_cls = cc_cls; - ret = GNUNET_PROGRAM_run ((sizeof (argv2) / sizeof (char *)) - 1, argv2, - testname, "nohelp", options, &run, rc); + ret = + GNUNET_PROGRAM_run ((sizeof (argv2) / sizeof (char *)) - 1, argv2, + testname, "nohelp", options, &run, rc); GNUNET_free (rc); GNUNET_free (argv2[0]); GNUNET_free (argv2[2]);