[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r22597 - gnunet/src/testbed
From: |
gnunet |
Subject: |
[GNUnet-SVN] r22597 - gnunet/src/testbed |
Date: |
Tue, 10 Jul 2012 17:37:07 +0200 |
Author: harsha
Date: 2012-07-10 17:37:07 +0200 (Tue, 10 Jul 2012)
New Revision: 22597
Modified:
gnunet/src/testbed/Makefile.am
gnunet/src/testbed/test_testbed_api.c
gnunet/src/testbed/test_testbed_api_hosts.c
Log:
-fixing 2494
Modified: gnunet/src/testbed/Makefile.am
===================================================================
--- gnunet/src/testbed/Makefile.am 2012-07-10 14:59:27 UTC (rev 22596)
+++ gnunet/src/testbed/Makefile.am 2012-07-10 15:37:07 UTC (rev 22597)
@@ -57,7 +57,8 @@
if ENABLE_TEST_RUN
TESTS = \
- test_testbed_api_hosts
+ test_testbed_api_hosts \
+ test_testbed_api
endif
test_testbed_api_hosts_SOURCES = \
Modified: gnunet/src/testbed/test_testbed_api.c
===================================================================
--- gnunet/src/testbed/test_testbed_api.c 2012-07-10 14:59:27 UTC (rev
22596)
+++ gnunet/src/testbed/test_testbed_api.c 2012-07-10 15:37:07 UTC (rev
22597)
@@ -48,6 +48,11 @@
static struct GNUNET_TESTBED_Host *host;
/**
+ * The controller process
+ */
+static struct GNUNET_TESTBED_ControllerProc *cp;
+
+/**
* The controller handle
*/
static struct GNUNET_TESTBED_Controller *controller;
@@ -102,6 +107,8 @@
if (NULL != reg_handle)
GNUNET_TESTBED_cancel_registration (reg_handle);
GNUNET_TESTBED_controller_disconnect (controller);
+ if (NULL != cp)
+ GNUNET_TESTBED_controller_stop (cp);
GNUNET_TESTBED_host_destroy (neighbour);
GNUNET_TESTBED_host_destroy (host);
}
@@ -163,18 +170,23 @@
/**
- * Main point of test execution
+ * Main run function.
+ *
+ * @param cls NULL
+ * @param args arguments passed to GNUNET_PROGRAM_run
+ * @param cfgfile the path to configuration file
+ * @param cfg the configuration file handle
*/
static void
-run (void *cls,
- const struct GNUNET_CONFIGURATION_Handle *config,
- struct GNUNET_TESTING_Peer *peer)
+run (void *cls, char *const *args, const char *cfgfile,
+ const struct GNUNET_CONFIGURATION_Handle *config)
{
uint64_t event_mask;
cfg = config;
host = GNUNET_TESTBED_host_create (NULL, NULL, 0);
GNUNET_assert (NULL != host);
+ cp = GNUNET_TESTBED_controller_start (host);
event_mask = 0;
event_mask |= (1L << GNUNET_TESTBED_ET_PEER_START);
event_mask |= (1L << GNUNET_TESTBED_ET_PEER_STOP);
@@ -199,15 +211,20 @@
*/
int main (int argc, char **argv)
{
- struct GNUNET_TESTBED_ControllerProc *cp;
+ int ret;
- cp = GNUNET_TESTBED_controller_start (NULL);
-
+ char *const argv2[] = { "test_testbed_api",
+ "-c", "test_testbed_api.conf",
+ NULL
+ };
+ struct GNUNET_GETOPT_CommandLineOption options[] = {
+ GNUNET_GETOPT_OPTION_END
+ };
result = GNUNET_SYSERR;
- if (0 != GNUNET_TESTING_peer_run ("test_testbed_api",
- "test_testbed_api.conf",
- &run, NULL))
+ ret = GNUNET_PROGRAM_run ((sizeof (argv2) / sizeof (char *)) - 1, argv2,
+ "test_testbed_api", "nohelp", options, &run,
+ NULL);
+ if ((GNUNET_OK != ret) || (GNUNET_OK != result))
return 1;
- GNUNET_TESTBED_controller_stop (cp);
- return result;
+ return 0;
}
Modified: gnunet/src/testbed/test_testbed_api_hosts.c
===================================================================
--- gnunet/src/testbed/test_testbed_api_hosts.c 2012-07-10 14:59:27 UTC (rev
22596)
+++ gnunet/src/testbed/test_testbed_api_hosts.c 2012-07-10 15:37:07 UTC (rev
22597)
@@ -90,7 +90,7 @@
{
int ret;
- char *const argv2[] = { "test_lockmanager_api_hosts",
+ char *const argv2[] = { "test_testbed_api_hosts",
"-c", "test_testbed_api.conf",
NULL
};
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r22597 - gnunet/src/testbed,
gnunet <=