/*
This file is part of GNUnet
- (C) 2008, 2009, 2012 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2008, 2009, 2012 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
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., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
*/
/**
* @file testing/test_testing_new_peerstartup.c
* @brief test case for testing peer startup and shutdown using new testing
- * library
+ * library
* @author Sree Harsha Totakura
*/
#include "platform.h"
-#include "gnunet_configuration_lib.h"
-#include "gnunet_os_lib.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_util_lib.h"
+#include "gnunet_testing_lib.h"
#define LOG(kind,...) \
GNUNET_log (kind, __VA_ARGS__)
* The testing system
*/
struct GNUNET_TESTING_System *system;
-
+
/**
* The peer which has been started by the testing system
*/
* Task for shutdown
*
* @param cls the testing context
- * @param tc the tast context
*/
static void
-do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+do_shutdown (void *cls)
{
struct TestingContext *test_ctx = cls;
-
+
GNUNET_assert (NULL != test_ctx);
if (NULL != test_ctx->peer)
{
char *emsg;
struct GNUNET_PeerIdentity id;
- test_ctx = GNUNET_malloc (sizeof (struct TestingContext));
- test_ctx->system =
+ test_ctx = GNUNET_new (struct TestingContext);
+ test_ctx->system =
GNUNET_TESTING_system_create ("test-gnunet-testing",
- "127.0.0.1", NULL);
+ "127.0.0.1", NULL, NULL);
+ emsg = NULL;
if (NULL == test_ctx->system)
goto end;
test_ctx->cfg = GNUNET_CONFIGURATION_dup (cfg);
- emsg = NULL;
- test_ctx->peer =
+ test_ctx->peer =
GNUNET_TESTING_peer_configure (test_ctx->system,
test_ctx->cfg,
0, &id, &emsg);
end:
GNUNET_SCHEDULER_add_now (&do_shutdown, test_ctx);
+ GNUNET_free_non_null (emsg);
}
GNUNET_GETOPT_OPTION_END
};
+ status = GNUNET_SYSERR;
if (GNUNET_OK !=
GNUNET_PROGRAM_run (argc, argv,
- "test_testing_new_peerstartup",
+ "test_testing_peerstartup",
"test case for peerstartup using new testing library",
options, &run, NULL))
return 1;
- return 0;
+ return (GNUNET_OK == status) ? 0 : 1;
}
/* end of test_testing_peerstartup.c */