diff options
Diffstat (limited to 'src/testbed/test_testbed_api_hosts.c')
-rw-r--r-- | src/testbed/test_testbed_api_hosts.c | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/src/testbed/test_testbed_api_hosts.c b/src/testbed/test_testbed_api_hosts.c index 54e2461c7..ae71abc54 100644 --- a/src/testbed/test_testbed_api_hosts.c +++ b/src/testbed/test_testbed_api_hosts.c | |||
@@ -39,11 +39,6 @@ | |||
39 | static struct GNUNET_TESTBED_Host *host; | 39 | static struct GNUNET_TESTBED_Host *host; |
40 | 40 | ||
41 | /** | 41 | /** |
42 | * The host helper handle | ||
43 | */ | ||
44 | static struct GNUNET_TESTBED_HelperHandle *helper_handle; | ||
45 | |||
46 | /** | ||
47 | * Global test status | 42 | * Global test status |
48 | */ | 43 | */ |
49 | static int status; | 44 | static int status; |
@@ -62,27 +57,11 @@ GNUNET_SCHEDULER_TaskIdentifier shutdown_id; | |||
62 | static void | 57 | static void |
63 | do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 58 | do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) |
64 | { | 59 | { |
65 | GNUNET_TESTBED_host_stop_ (helper_handle); | ||
66 | GNUNET_TESTBED_host_destroy (host); | 60 | GNUNET_TESTBED_host_destroy (host); |
67 | } | 61 | } |
68 | 62 | ||
69 | 63 | ||
70 | /** | 64 | /** |
71 | * Callback that will be called when the helper process dies. This is not called | ||
72 | * when the helper process is stoped using GNUNET_HELPER_stop() | ||
73 | * | ||
74 | * @param cls the closure from GNUNET_HELPER_start() | ||
75 | */ | ||
76 | static void | ||
77 | exp_cb (void *cls) | ||
78 | { | ||
79 | status = GNUNET_SYSERR; | ||
80 | GNUNET_SCHEDULER_cancel (shutdown_id); | ||
81 | GNUNET_SCHEDULER_add_now (&do_shutdown, NULL); | ||
82 | } | ||
83 | |||
84 | |||
85 | /** | ||
86 | * Main run function. | 65 | * Main run function. |
87 | * | 66 | * |
88 | * @param cls NULL | 67 | * @param cls NULL |
@@ -102,8 +81,6 @@ run (void *cls, char *const *args, const char *cfgfile, | |||
102 | GNUNET_assert (NULL != host); | 81 | GNUNET_assert (NULL != host); |
103 | GNUNET_assert (0 == GNUNET_TESTBED_host_get_id_ (host)); | 82 | GNUNET_assert (0 == GNUNET_TESTBED_host_get_id_ (host)); |
104 | GNUNET_assert (host == GNUNET_TESTBED_host_lookup_by_id_ (0)); | 83 | GNUNET_assert (host == GNUNET_TESTBED_host_lookup_by_id_ (0)); |
105 | helper_handle = GNUNET_TESTBED_host_run_ ("127.0.0.1", host, cfg, &exp_cb, NULL); | ||
106 | GNUNET_assert (NULL != helper_handle); | ||
107 | shutdown_id = | 84 | shutdown_id = |
108 | GNUNET_SCHEDULER_add_delayed (TIME_REL_SECS (2), &do_shutdown, NULL); | 85 | GNUNET_SCHEDULER_add_delayed (TIME_REL_SECS (2), &do_shutdown, NULL); |
109 | } | 86 | } |