-remove async ecc key generation, not needed

[oweals/gnunet.git] / src / util / test_program.c

diff --git a/src/util/test_program.c b/src/util/test_program.c
index 08997627775d1e93e1ea9cabe712243ebe035038..faeb4e716297e78d8d9bf608ed7fd504a11b0466 100644 (file)
--- a/src/util/test_program.c
+++ b/src/util/test_program.c
@@ -4,7 +4,7 @@
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published

-     by the Free Software Foundation; either version 2, or (at your
+     by the Free Software Foundation; either version 3, or (at your

      option) any later version.
 
      GNUnet is distributed in the hope that it will be useful, but
      option) any later version.
 
      GNUnet is distributed in the hope that it will be useful, but


@@ -36,19 +36,20 @@ static struct GNUNET_GETOPT_CommandLineOption options1[] = {
 
 static struct GNUNET_GETOPT_CommandLineOption options2[] = {
   {'n', "name", NULL, "description", 0, &GNUNET_GETOPT_set_one, &setme1},
 
 static struct GNUNET_GETOPT_CommandLineOption options2[] = {
   {'n', "name", NULL, "description", 0, &GNUNET_GETOPT_set_one, &setme1},

-  {'N', "number", NULL, "description", 0, &GNUNET_GETOPT_set_one, &setme2}
+  {'N', "number", NULL, "description", 0, &GNUNET_GETOPT_set_one, &setme2},
+  GNUNET_GETOPT_OPTION_END

 };
 
 static struct GNUNET_GETOPT_CommandLineOption options3[] = {
   {'N', "number", NULL, "description", 0, &GNUNET_GETOPT_set_one, &setme1},
 };
 
 static struct GNUNET_GETOPT_CommandLineOption options3[] = {
   {'N', "number", NULL, "description", 0, &GNUNET_GETOPT_set_one, &setme1},

-  {'n', "name", NULL, "description", 0, &GNUNET_GETOPT_set_one, &setme2}
-
+  {'n', "name", NULL, "description", 0, &GNUNET_GETOPT_set_one, &setme2},
+  GNUNET_GETOPT_OPTION_END

 };
 
 static struct GNUNET_GETOPT_CommandLineOption options4[] = {
   {'n', "name", NULL, "description", 0, &GNUNET_GETOPT_set_one, &setme1},
 };
 
 static struct GNUNET_GETOPT_CommandLineOption options4[] = {
   {'n', "name", NULL, "description", 0, &GNUNET_GETOPT_set_one, &setme1},

-  {'n', "number", NULL, "description", 0, &GNUNET_GETOPT_set_one, &setme2}
-
+  {'n', "number", NULL, "description", 0, &GNUNET_GETOPT_set_one, &setme2},
+  GNUNET_GETOPT_OPTION_END

 };
 
 /**
 };
 
 /**


@@ -56,14 +57,12 @@ static struct GNUNET_GETOPT_CommandLineOption options4[] = {
  */
 
 static void
  */
 
 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;
 {
   int *ok = cls;

+

   GNUNET_assert (setme1 == 1);
   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"));
   GNUNET_assert (0 == strcmp (args[0], "extra"));
   GNUNET_assert (args[1] == NULL);
   GNUNET_assert (0 == strcmp (cfgfile, "test_program_data.conf"));


@@ -79,6 +78,7 @@ static int
 check ()
 {
   int ok = 1;
 check ()
 {
   int ok = 1;

+

   char *const argv[] = {
     "test_program",
     "-c",
   char *const argv[] = {
     "test_program",
     "-c",


@@ -91,26 +91,18 @@ check ()
   };
 
   GNUNET_assert (GNUNET_OK ==
   };
 
   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_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_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_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;
 }
 
   return ok;
 }