diff options
Diffstat (limited to 'src/testing/test_testing.c')
-rw-r--r-- | src/testing/test_testing.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/testing/test_testing.c b/src/testing/test_testing.c index 925579a71..b33f3ee1b 100644 --- a/src/testing/test_testing.c +++ b/src/testing/test_testing.c | |||
@@ -33,14 +33,16 @@ end_cb (void *cls, const char *emsg) | |||
33 | { | 33 | { |
34 | if (emsg != NULL) | 34 | if (emsg != NULL) |
35 | { | 35 | { |
36 | fprintf (stderr, "Error terminaing daemon: `%s'\n", | 36 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Ending with error: %s\n", emsg); |
37 | emsg); | 37 | ok = 1; |
38 | return; | ||
39 | } | 38 | } |
39 | else | ||
40 | { | ||
40 | #if VERBOSE | 41 | #if VERBOSE |
41 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Daemon terminated, will now exit.\n"); | 42 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Daemon terminated, will now exit.\n"); |
42 | #endif | 43 | #endif |
43 | ok = 0; | 44 | ok = 0; |
45 | } | ||
44 | } | 46 | } |
45 | 47 | ||
46 | static void | 48 | static void |
@@ -54,7 +56,7 @@ my_cb (void *cls, | |||
54 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 56 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
55 | "Daemon `%s' started, will now stop it.\n", GNUNET_i2s (id)); | 57 | "Daemon `%s' started, will now stop it.\n", GNUNET_i2s (id)); |
56 | #endif | 58 | #endif |
57 | GNUNET_TESTING_daemon_stop (d, &end_cb, NULL); | 59 | GNUNET_TESTING_daemon_stop (d, &end_cb, NULL, GNUNET_YES); |
58 | } | 60 | } |
59 | 61 | ||
60 | 62 | ||
@@ -70,7 +72,7 @@ run (void *cls, | |||
70 | #if VERBOSE | 72 | #if VERBOSE |
71 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Starting daemon.\n"); | 73 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Starting daemon.\n"); |
72 | #endif | 74 | #endif |
73 | d = GNUNET_TESTING_daemon_start (sched, cfg, NULL, &my_cb, NULL); | 75 | d = GNUNET_TESTING_daemon_start (sched, cfg, NULL, NULL, NULL, &my_cb, NULL); |
74 | GNUNET_assert (d != NULL); | 76 | GNUNET_assert (d != NULL); |
75 | } | 77 | } |
76 | 78 | ||