aboutsummaryrefslogtreecommitdiff
path: root/src/core/test_core_api_start_only.c
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2010-05-11 19:40:39 +0000
committerChristian Grothoff <christian@grothoff.org>2010-05-11 19:40:39 +0000
commit5882a0a99902e4555f78a05a3d68dc72f864437f (patch)
treec080e0c35c98a1548d7dd8c1f1df6c16ba93508a /src/core/test_core_api_start_only.c
parentf557d63b75c8b14922e4a308dfc486f7e4e9f6db (diff)
downloadgnunet-5882a0a99902e4555f78a05a3d68dc72f864437f.tar.gz
gnunet-5882a0a99902e4555f78a05a3d68dc72f864437f.zip
die unstoppable multi api, die
Diffstat (limited to 'src/core/test_core_api_start_only.c')
-rw-r--r--src/core/test_core_api_start_only.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/src/core/test_core_api_start_only.c b/src/core/test_core_api_start_only.c
index f33597836..a655d0b51 100644
--- a/src/core/test_core_api_start_only.c
+++ b/src/core/test_core_api_start_only.c
@@ -31,7 +31,7 @@
31#include "gnunet_program_lib.h" 31#include "gnunet_program_lib.h"
32#include "gnunet_scheduler_lib.h" 32#include "gnunet_scheduler_lib.h"
33 33
34#define VERBOSE GNUNET_YES 34#define VERBOSE GNUNET_NO
35 35
36#define START_ARM GNUNET_YES 36#define START_ARM GNUNET_YES
37 37
@@ -142,9 +142,6 @@ init_notify (void *cls,
142 GNUNET_assert (cls == &p2); 142 GNUNET_assert (cls == &p2);
143 GNUNET_CORE_disconnect (p1.ch); 143 GNUNET_CORE_disconnect (p1.ch);
144 GNUNET_CORE_disconnect (p2.ch); 144 GNUNET_CORE_disconnect (p2.ch);
145 GNUNET_ARM_stop_services (p1.cfg, sched, "core", NULL);
146 GNUNET_ARM_stop_services (p2.cfg, sched, "core", NULL);
147
148 ok = 0; 145 ok = 0;
149 } 146 }
150} 147}
@@ -163,7 +160,6 @@ setup_peer (struct PeerContext *p, const char *cfgname)
163 "-c", cfgname, NULL); 160 "-c", cfgname, NULL);
164#endif 161#endif
165 GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname)); 162 GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname));
166 GNUNET_ARM_start_services (p->cfg, sched, "core", NULL);
167} 163}
168 164
169 165
@@ -209,7 +205,7 @@ stop_arm (struct PeerContext *p)
209static int 205static int
210check () 206check ()
211{ 207{
212 char *const argv[] = { "test-core-api", 208 char *const argv[] = { "test-core-api-start-only",
213 "-c", 209 "-c",
214 "test_core_api_data.conf", 210 "test_core_api_data.conf",
215#if VERBOSE 211#if VERBOSE
@@ -223,7 +219,7 @@ check ()
223 219
224 ok = 1; 220 ok = 1;
225 GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, 221 GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1,
226 argv, "test-core-api", "nohelp", options, &run, &ok); 222 argv, "test-core-api-start-only", "nohelp", options, &run, &ok);
227 stop_arm (&p1); 223 stop_arm (&p1);
228 stop_arm (&p2); 224 stop_arm (&p2);
229 return ok; 225 return ok;
@@ -234,7 +230,7 @@ main (int argc, char *argv[])
234{ 230{
235 int ret; 231 int ret;
236 232
237 GNUNET_log_setup ("test-core-api", 233 GNUNET_log_setup ("test-core-api-start-only",
238#if VERBOSE 234#if VERBOSE
239 "DEBUG", 235 "DEBUG",
240#else 236#else