diff options
author | Christian Grothoff <christian@grothoff.org> | 2012-10-29 16:14:03 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2012-10-29 16:14:03 +0000 |
commit | bcbcf005b4864ac5557c31da10521126d8880849 (patch) | |
tree | 444cafefb16e1c5a4ba13ce2db07d6ec1f37675e /src/hostlist/test_gnunet_daemon_hostlist_learning.c | |
parent | 119193d6350bbbd8c6ecbd60ccc8301223d6f6d6 (diff) | |
download | gnunet-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/hostlist/test_gnunet_daemon_hostlist_learning.c')
-rw-r--r-- | src/hostlist/test_gnunet_daemon_hostlist_learning.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/hostlist/test_gnunet_daemon_hostlist_learning.c b/src/hostlist/test_gnunet_daemon_hostlist_learning.c index 8a0992dda..b7199637e 100644 --- a/src/hostlist/test_gnunet_daemon_hostlist_learning.c +++ b/src/hostlist/test_gnunet_daemon_hostlist_learning.c | |||
@@ -382,10 +382,12 @@ setup_learn_peer (struct PeerContext *p, const char *cfgname) | |||
382 | { | 382 | { |
383 | char *filename; | 383 | char *filename; |
384 | unsigned int result; | 384 | unsigned int result; |
385 | char *binary; | ||
385 | 386 | ||
387 | binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-arm"); | ||
386 | p->cfg = GNUNET_CONFIGURATION_create (); | 388 | p->cfg = GNUNET_CONFIGURATION_create (); |
387 | p->arm_proc = | 389 | p->arm_proc = |
388 | GNUNET_OS_start_process (GNUNET_YES, GNUNET_OS_INHERIT_STD_OUT_AND_ERR, NULL, NULL, "gnunet-service-arm", | 390 | GNUNET_OS_start_process (GNUNET_YES, GNUNET_OS_INHERIT_STD_OUT_AND_ERR, NULL, NULL, binary, |
389 | "gnunet-service-arm", | 391 | "gnunet-service-arm", |
390 | "-c", cfgname, NULL); | 392 | "-c", cfgname, NULL); |
391 | GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname)); | 393 | GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname)); |
@@ -408,20 +410,25 @@ setup_learn_peer (struct PeerContext *p, const char *cfgname) | |||
408 | GNUNET_assert (NULL != p->core); | 410 | GNUNET_assert (NULL != p->core); |
409 | p->stats = GNUNET_STATISTICS_create ("hostlist", p->cfg); | 411 | p->stats = GNUNET_STATISTICS_create ("hostlist", p->cfg); |
410 | GNUNET_assert (NULL != p->stats); | 412 | GNUNET_assert (NULL != p->stats); |
413 | GNUNET_free (binary); | ||
411 | } | 414 | } |
412 | 415 | ||
413 | 416 | ||
414 | static void | 417 | static void |
415 | setup_adv_peer (struct PeerContext *p, const char *cfgname) | 418 | setup_adv_peer (struct PeerContext *p, const char *cfgname) |
416 | { | 419 | { |
420 | char *binary; | ||
421 | |||
422 | binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-arm"); | ||
417 | p->cfg = GNUNET_CONFIGURATION_create (); | 423 | p->cfg = GNUNET_CONFIGURATION_create (); |
418 | p->arm_proc = | 424 | p->arm_proc = |
419 | GNUNET_OS_start_process (GNUNET_YES, GNUNET_OS_INHERIT_STD_OUT_AND_ERR, NULL, NULL, "gnunet-service-arm", | 425 | GNUNET_OS_start_process (GNUNET_YES, GNUNET_OS_INHERIT_STD_OUT_AND_ERR, NULL, NULL, binary, |
420 | "gnunet-service-arm", | 426 | "gnunet-service-arm", |
421 | "-c", cfgname, NULL); | 427 | "-c", cfgname, NULL); |
422 | GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname)); | 428 | GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname)); |
423 | p->stats = GNUNET_STATISTICS_create ("hostlist", p->cfg); | 429 | p->stats = GNUNET_STATISTICS_create ("hostlist", p->cfg); |
424 | GNUNET_assert (NULL != p->stats); | 430 | GNUNET_assert (NULL != p->stats); |
431 | GNUNET_free (binary); | ||
425 | } | 432 | } |
426 | 433 | ||
427 | 434 | ||