projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed one serious bug, working on another. Still very broken.
[oweals/gnunet.git]
/
src
/
util
/
test_program.c
diff --git
a/src/util/test_program.c
b/src/util/test_program.c
index 0ff49b81efe944b08e266770716848d52fe077ba..6e5ca39decd9f7eed8fc58bab0c07cc3bb5c33e7 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 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
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;
@@
-58,7
+55,7
@@
static struct GNUNET_GETOPT_CommandLineOption options4[] = {
static void
runner (void *cls, char *const *args, const char *cfgfile,
static void
runner (void *cls, char *const *args, const char *cfgfile,
- const struct GNUNET_CONFIGURATION_Handle *cfg)
+
const struct GNUNET_CONFIGURATION_Handle *cfg)
{
int *ok = cls;
{
int *ok = cls;
@@
-91,18
+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;
}