diff options
author | Sree Harsha Totakura <totakura@in.tum.de> | 2014-02-20 10:35:33 +0000 |
---|---|---|
committer | Sree Harsha Totakura <totakura@in.tum.de> | 2014-02-20 10:35:33 +0000 |
commit | 2a35e345a204cb357361406f28e07bf9076cb092 (patch) | |
tree | 8c51b5dae07a1f3a3a6a13ac6c623e0b0df2a070 /src/core | |
parent | a06237deeec4aed38b09f633d7ebbeabb7da4c03 (diff) | |
download | gnunet-2a35e345a204cb357361406f28e07bf9076cb092.tar.gz gnunet-2a35e345a204cb357361406f28e07bf9076cb092.zip |
Allow redirection of STDERR when starting processes.
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/test_core_api.c | 2 | ||||
-rw-r--r-- | src/core/test_core_api_reliability.c | 8 | ||||
-rw-r--r-- | src/core/test_core_api_start_only.c | 2 | ||||
-rw-r--r-- | src/core/test_core_quota_compliance.c | 8 |
4 files changed, 12 insertions, 8 deletions
diff --git a/src/core/test_core_api.c b/src/core/test_core_api.c index b3674fdec..c570def84 100644 --- a/src/core/test_core_api.c +++ b/src/core/test_core_api.c | |||
@@ -301,7 +301,7 @@ setup_peer (struct PeerContext *p, const char *cfgname) | |||
301 | p->cfg = GNUNET_CONFIGURATION_create (); | 301 | p->cfg = GNUNET_CONFIGURATION_create (); |
302 | p->arm_proc = | 302 | p->arm_proc = |
303 | GNUNET_OS_start_process (GNUNET_YES, GNUNET_OS_INHERIT_STD_OUT_AND_ERR, | 303 | GNUNET_OS_start_process (GNUNET_YES, GNUNET_OS_INHERIT_STD_OUT_AND_ERR, |
304 | NULL, NULL, | 304 | NULL, NULL, NULL, |
305 | binary, | 305 | binary, |
306 | "gnunet-service-arm", | 306 | "gnunet-service-arm", |
307 | "-c", cfgname, NULL); | 307 | "-c", cfgname, NULL); |
diff --git a/src/core/test_core_api_reliability.c b/src/core/test_core_api_reliability.c index cb05fa9e5..fba153ade 100644 --- a/src/core/test_core_api_reliability.c +++ b/src/core/test_core_api_reliability.c | |||
@@ -419,9 +419,11 @@ setup_peer (struct PeerContext *p, const char *cfgname) | |||
419 | binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-arm"); | 419 | binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-arm"); |
420 | p->cfg = GNUNET_CONFIGURATION_create (); | 420 | p->cfg = GNUNET_CONFIGURATION_create (); |
421 | p->arm_proc = | 421 | p->arm_proc = |
422 | GNUNET_OS_start_process (GNUNET_YES, GNUNET_OS_INHERIT_STD_OUT_AND_ERR, NULL, NULL, binary, | 422 | GNUNET_OS_start_process (GNUNET_YES, GNUNET_OS_INHERIT_STD_OUT_AND_ERR, |
423 | "gnunet-service-arm", | 423 | NULL, NULL, NULL, |
424 | "-c", cfgname, NULL); | 424 | binary, |
425 | "gnunet-service-arm", | ||
426 | "-c", cfgname, NULL); | ||
425 | GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname)); | 427 | GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname)); |
426 | p->th = GNUNET_TRANSPORT_connect (p->cfg, NULL, p, NULL, NULL, NULL); | 428 | p->th = GNUNET_TRANSPORT_connect (p->cfg, NULL, p, NULL, NULL, NULL); |
427 | GNUNET_assert (p->th != NULL); | 429 | GNUNET_assert (p->th != NULL); |
diff --git a/src/core/test_core_api_start_only.c b/src/core/test_core_api_start_only.c index 255de0319..3c14b01eb 100644 --- a/src/core/test_core_api_start_only.c +++ b/src/core/test_core_api_start_only.c | |||
@@ -134,7 +134,7 @@ setup_peer (struct PeerContext *p, const char *cfgname) | |||
134 | p->cfg = GNUNET_CONFIGURATION_create (); | 134 | p->cfg = GNUNET_CONFIGURATION_create (); |
135 | p->arm_proc = | 135 | p->arm_proc = |
136 | GNUNET_OS_start_process (GNUNET_YES, GNUNET_OS_INHERIT_STD_OUT_AND_ERR, | 136 | GNUNET_OS_start_process (GNUNET_YES, GNUNET_OS_INHERIT_STD_OUT_AND_ERR, |
137 | NULL, NULL, | 137 | NULL, NULL, NULL, |
138 | binary, | 138 | binary, |
139 | "gnunet-service-arm", | 139 | "gnunet-service-arm", |
140 | "-c", cfgname, NULL); | 140 | "-c", cfgname, NULL); |
diff --git a/src/core/test_core_quota_compliance.c b/src/core/test_core_quota_compliance.c index 0e74fbef5..bf9197f0c 100644 --- a/src/core/test_core_quota_compliance.c +++ b/src/core/test_core_quota_compliance.c | |||
@@ -571,9 +571,11 @@ setup_peer (struct PeerContext *p, const char *cfgname) | |||
571 | binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-arm"); | 571 | binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-arm"); |
572 | p->cfg = GNUNET_CONFIGURATION_create (); | 572 | p->cfg = GNUNET_CONFIGURATION_create (); |
573 | p->arm_proc = | 573 | p->arm_proc = |
574 | GNUNET_OS_start_process (GNUNET_YES, GNUNET_OS_INHERIT_STD_OUT_AND_ERR, NULL, NULL, binary, | 574 | GNUNET_OS_start_process (GNUNET_YES, GNUNET_OS_INHERIT_STD_OUT_AND_ERR, |
575 | "gnunet-service-arm", | 575 | NULL, NULL, NULL, |
576 | "-c", cfgname, NULL); | 576 | binary, |
577 | "gnunet-service-arm", | ||
578 | "-c", cfgname, NULL); | ||
577 | GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname)); | 579 | GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname)); |
578 | p->stats = GNUNET_STATISTICS_create ("core", p->cfg); | 580 | p->stats = GNUNET_STATISTICS_create ("core", p->cfg); |
579 | GNUNET_assert (p->stats != NULL); | 581 | GNUNET_assert (p->stats != NULL); |