X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Futil%2Ftest_program.c;h=faeb4e716297e78d8d9bf608ed7fd504a11b0466;hb=9b0414d6f98f33d7e1c33dafe105eb58da0bf79b;hp=e7745abff375ae07a602bb1f622069867530c415;hpb=38b29592cf2e8b816cab68579e07e2477153f739;p=oweals%2Fgnunet.git diff --git a/src/util/test_program.c b/src/util/test_program.c index e7745abff..faeb4e716 100644 --- a/src/util/test_program.c +++ b/src/util/test_program.c @@ -57,14 +57,12 @@ static struct GNUNET_GETOPT_CommandLineOption options4[] = { */ static void -runner (void *cls, - struct GNUNET_SCHEDULER_Handle *sched, - char *const *args, - const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *cfg) +runner (void *cls, char *const *args, const char *cfgfile, + const struct GNUNET_CONFIGURATION_Handle *cfg) { int *ok = cls; + GNUNET_assert (setme1 == 1); - GNUNET_assert (sched != NULL); GNUNET_assert (0 == strcmp (args[0], "extra")); GNUNET_assert (args[1] == NULL); GNUNET_assert (0 == strcmp (cfgfile, "test_program_data.conf")); @@ -80,6 +78,7 @@ static int check () { int ok = 1; + char *const argv[] = { "test_program", "-c", @@ -92,26 +91,18 @@ check () }; GNUNET_assert (GNUNET_OK == - GNUNET_PROGRAM_run (7, - argv, - "test_program", - "A test", options1, &runner, &ok)); + GNUNET_PROGRAM_run (7, argv, "test_program", "A test", + options1, &runner, &ok)); GNUNET_assert (GNUNET_OK == - GNUNET_PROGRAM_run (7, - argv, - "test_program", - "A test", options2, &runner, &ok)); + GNUNET_PROGRAM_run (7, argv, "test_program", "A test", + options2, &runner, &ok)); GNUNET_assert (GNUNET_OK == - GNUNET_PROGRAM_run (7, - argv, - "test_program", - "A test", options3, &runner, &ok)); + GNUNET_PROGRAM_run (7, argv, "test_program", "A test", + options3, &runner, &ok)); GNUNET_assert (GNUNET_OK == - GNUNET_PROGRAM_run (7, - argv, - "test_program", - "A test", options4, &runner, &ok)); + GNUNET_PROGRAM_run (7, argv, "test_program", "A test", + options4, &runner, &ok)); return ok; }