projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rps.conf is generated from rps.conf.in
[oweals/gnunet.git]
/
src
/
util
/
test_program.c
diff --git
a/src/util/test_program.c
b/src/util/test_program.c
index e7745abff375ae07a602bb1f622069867530c415..669cee7bdc1ea4670c0f123f81bd4b3732051a9d 100644
(file)
--- a/
src/util/test_program.c
+++ b/
src/util/test_program.c
@@
-1,6
+1,6
@@
/*
This file is part of GNUnet.
/*
This file is part of GNUnet.
- (C) 2009 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2009 GNUnet e.V.
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
@@
-14,18
+14,15
@@
You should have received a copy of the GNU General Public License
along with GNUnet; see the file COPYING. If not, write to the
You should have received a copy of the GNU General Public License
along with GNUnet; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 5
9 Temple Place - Suite 330
,
- Boston, MA 0211
1-1307
, USA.
+ Free Software Foundation, Inc., 5
1 Franklin Street, Fifth Floor
,
+ Boston, MA 0211
0-1301
, USA.
*/
/**
* @file util/test_program.c
* @brief tests for program.c
*/
#include "platform.h"
*/
/**
* @file util/test_program.c
* @brief tests for program.c
*/
#include "platform.h"
-#include "gnunet_common.h"
-#include "gnunet_program_lib.h"
-#include "gnunet_scheduler_lib.h"
-#include "gnunet_time_lib.h"
+#include "gnunet_util_lib.h"
static int setme1, setme2;
static int setme1, setme2;
@@
-57,14
+54,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"));
@@
-80,6
+75,7
@@
static int
check ()
{
int ok = 1;
check ()
{
int ok = 1;
+
char *const argv[] = {
"test_program",
"-c",
char *const argv[] = {
"test_program",
"-c",
@@
-92,26
+88,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;
}