[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r9261 - gnunet/src/util
From: |
gnunet |
Subject: |
[GNUnet-SVN] r9261 - gnunet/src/util |
Date: |
Fri, 23 Oct 2009 15:55:31 -0600 |
Author: jilu
Date: 2009-10-23 15:55:31 -0600 (Fri, 23 Oct 2009)
New Revision: 9261
Modified:
gnunet/src/util/test_program.c
Log:
complete test program
Modified: gnunet/src/util/test_program.c
===================================================================
--- gnunet/src/util/test_program.c 2009-10-23 20:28:44 UTC (rev 9260)
+++ gnunet/src/util/test_program.c 2009-10-23 21:55:31 UTC (rev 9261)
@@ -27,25 +27,42 @@
#include "gnunet_scheduler_lib.h"
#include "gnunet_time_lib.h"
-static int setme;
+static int setme1, setme2;
-static struct GNUNET_GETOPT_CommandLineOption options[] = {
- {'n', "name", NULL, "description", 0, &GNUNET_GETOPT_set_one, &setme},
+static struct GNUNET_GETOPT_CommandLineOption options1[] = {
+ {'n', "name", NULL, "description", 0, &GNUNET_GETOPT_set_one, &setme1},
GNUNET_GETOPT_OPTION_END
};
+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}
+};
+
+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}
+
+};
+
+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}
+
+};
+
/**
* Main function that will be run.
*/
+
static void
runner (void *cls,
struct GNUNET_SCHEDULER_Handle *sched,
char *const *args,
- const char *cfgfile,
- const struct GNUNET_CONFIGURATION_Handle *cfg)
+ const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *cfg)
{
int *ok = cls;
- GNUNET_assert (setme == 1);
+ GNUNET_assert (setme1 == 1);
GNUNET_assert (sched != NULL);
GNUNET_assert (0 == strcmp (args[0], "extra"));
GNUNET_assert (args[1] == NULL);
@@ -54,7 +71,6 @@
*ok = 0;
}
-
/**
* Main method, starts scheduler with task1,
* checks that "ok" is correct at the end.
@@ -73,11 +89,29 @@
"extra",
NULL
};
+
GNUNET_assert (GNUNET_OK ==
GNUNET_PROGRAM_run (7,
argv,
"test_program",
- "A test", options, &runner, &ok));
+ "A test", options1, &runner, &ok));
+
+ GNUNET_assert (GNUNET_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_assert (GNUNET_OK ==
+ GNUNET_PROGRAM_run (7,
+ argv,
+ "test_program",
+ "A test", options4, &runner, &ok));
+
return ok;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r9261 - gnunet/src/util,
gnunet <=