diff options
| author | Christian Grothoff <christian@grothoff.org> | 2010-07-21 10:11:37 +0000 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2010-07-21 10:11:37 +0000 |
| commit | abba6e6fd37fca3af410ffe06dfd758ee71bdb3c (patch) | |
| tree | f365df91b1abbb338681a912160b64d1823a3e7b /src/arm | |
| parent | 0683c177c43b99df858094da1e2b06a4240b4066 (diff) | |
| download | gnunet-abba6e6fd37fca3af410ffe06dfd758ee71bdb3c.tar.gz gnunet-abba6e6fd37fca3af410ffe06dfd758ee71bdb3c.zip | |
do not daemonize when running tests
Diffstat (limited to 'src/arm')
| -rw-r--r-- | src/arm/arm_api.c | 38 |
1 files changed, 30 insertions, 8 deletions
diff --git a/src/arm/arm_api.c b/src/arm/arm_api.c index dbd65cae2..2d7ac931c 100644 --- a/src/arm/arm_api.c +++ b/src/arm/arm_api.c | |||
| @@ -434,16 +434,38 @@ arm_service_report (void *cls, | |||
| 434 | GNUNET_free (lopostfix); | 434 | GNUNET_free (lopostfix); |
| 435 | return; | 435 | return; |
| 436 | } | 436 | } |
| 437 | pid = do_start_process (NULL, | 437 | if ((GNUNET_YES == GNUNET_CONFIGURATION_have_value (cfg, |
| 438 | loprefix, | 438 | "TESTING", |
| 439 | binary, | 439 | "WEAKRANDOM")) && |
| 440 | "-c", config, | 440 | (GNUNET_YES == GNUNET_CONFIGURATION_get_value_yesno (cfg, |
| 441 | "TESTING", | ||
| 442 | "WEAKRANDOM"))) | ||
| 443 | { | ||
| 444 | /* we're clearly running a test, don't daemonize */ | ||
| 445 | pid = do_start_process (NULL, | ||
| 446 | loprefix, | ||
| 447 | binary, | ||
| 448 | "-c", config, | ||
| 441 | #if DEBUG_ARM | 449 | #if DEBUG_ARM |
| 442 | "-L", "DEBUG", | 450 | "-L", "DEBUG", |
| 443 | #endif | 451 | #endif |
| 444 | "-d", | 452 | /* no daemonization! */ |
| 445 | lopostfix, | 453 | lopostfix, |
| 446 | NULL); | 454 | NULL); |
| 455 | } | ||
| 456 | else | ||
| 457 | { | ||
| 458 | pid = do_start_process (NULL, | ||
| 459 | loprefix, | ||
| 460 | binary, | ||
| 461 | "-c", config, | ||
| 462 | #if DEBUG_ARM | ||
| 463 | "-L", "DEBUG", | ||
| 464 | #endif | ||
| 465 | "-d", | ||
| 466 | lopostfix, | ||
| 467 | NULL); | ||
| 468 | } | ||
| 447 | GNUNET_free (binary); | 469 | GNUNET_free (binary); |
| 448 | GNUNET_free (config); | 470 | GNUNET_free (config); |
| 449 | GNUNET_free (loprefix); | 471 | GNUNET_free (loprefix); |