aboutsummaryrefslogtreecommitdiff
path: root/src/core/test_core_api.c
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2012-10-29 16:14:03 +0000
committerChristian Grothoff <christian@grothoff.org>2012-10-29 16:14:03 +0000
commitbcbcf005b4864ac5557c31da10521126d8880849 (patch)
tree444cafefb16e1c5a4ba13ce2db07d6ec1f37675e /src/core/test_core_api.c
parent119193d6350bbbd8c6ecbd60ccc8301223d6f6d6 (diff)
downloadgnunet-bcbcf005b4864ac5557c31da10521126d8880849.tar.gz
gnunet-bcbcf005b4864ac5557c31da10521126d8880849.zip
installing all service, daemon and helper binaries to lib/gnunet/libexec/; updating code to run binaries from new location, which is no longer in PATH
Diffstat (limited to 'src/core/test_core_api.c')
-rw-r--r--src/core/test_core_api.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/src/core/test_core_api.c b/src/core/test_core_api.c
index 0512c9617..11fd14504 100644
--- a/src/core/test_core_api.c
+++ b/src/core/test_core_api.c
@@ -316,20 +316,23 @@ init_notify (void *cls, struct GNUNET_CORE_Handle *server,
316static void 316static void
317setup_peer (struct PeerContext *p, const char *cfgname) 317setup_peer (struct PeerContext *p, const char *cfgname)
318{ 318{
319 char *binary;
320
321 binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-arm");
319 p->cfg = GNUNET_CONFIGURATION_create (); 322 p->cfg = GNUNET_CONFIGURATION_create ();
320#if START_ARM 323#if START_ARM
321 p->arm_proc = 324 p->arm_proc =
322 GNUNET_OS_start_process (GNUNET_YES, GNUNET_OS_INHERIT_STD_OUT_AND_ERR, NULL, NULL, "gnunet-service-arm", 325 GNUNET_OS_start_process (GNUNET_YES, GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
323 "gnunet-service-arm", 326 NULL, NULL,
324#if VERBOSE 327 binary,
325 "-L", "DEBUG", 328 "gnunet-service-arm",
326#endif
327 "-c", cfgname, NULL); 329 "-c", cfgname, NULL);
328#endif 330#endif
329 GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname)); 331 GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname));
330 p->th = GNUNET_TRANSPORT_connect (p->cfg, NULL, p, NULL, NULL, NULL); 332 p->th = GNUNET_TRANSPORT_connect (p->cfg, NULL, p, NULL, NULL, NULL);
331 GNUNET_assert (p->th != NULL); 333 GNUNET_assert (p->th != NULL);
332 p->ghh = GNUNET_TRANSPORT_get_hello (p->th, &process_hello, p); 334 p->ghh = GNUNET_TRANSPORT_get_hello (p->th, &process_hello, p);
335 GNUNET_free (binary);
333} 336}
334 337
335 338