diff options
Diffstat (limited to 'src/chat/test_chat_private.c')
-rw-r--r-- | src/chat/test_chat_private.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/chat/test_chat_private.c b/src/chat/test_chat_private.c index 64150c107..b911d091f 100644 --- a/src/chat/test_chat_private.c +++ b/src/chat/test_chat_private.c | |||
@@ -32,8 +32,6 @@ | |||
32 | 32 | ||
33 | #define VERBOSE GNUNET_NO | 33 | #define VERBOSE GNUNET_NO |
34 | 34 | ||
35 | #define START_ARM GNUNET_YES | ||
36 | |||
37 | /** | 35 | /** |
38 | * How long until we give up on passing the test? | 36 | * How long until we give up on passing the test? |
39 | */ | 37 | */ |
@@ -47,9 +45,7 @@ | |||
47 | struct PeerContext | 45 | struct PeerContext |
48 | { | 46 | { |
49 | struct GNUNET_CONFIGURATION_Handle *cfg; | 47 | struct GNUNET_CONFIGURATION_Handle *cfg; |
50 | #if START_ARM | ||
51 | struct GNUNET_OS_Process *arm_proc; | 48 | struct GNUNET_OS_Process *arm_proc; |
52 | #endif | ||
53 | }; | 49 | }; |
54 | 50 | ||
55 | struct Wanted | 51 | struct Wanted |
@@ -134,12 +130,10 @@ setup_peer (struct PeerContext *p, const char *cfgname) | |||
134 | 130 | ||
135 | binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-arm"); | 131 | binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-arm"); |
136 | p->cfg = GNUNET_CONFIGURATION_create (); | 132 | p->cfg = GNUNET_CONFIGURATION_create (); |
137 | #if START_ARM | ||
138 | p->arm_proc = | 133 | p->arm_proc = |
139 | GNUNET_OS_start_process (GNUNET_YES, GNUNET_OS_INHERIT_STD_OUT_AND_ERR, NULL, NULL, binary, | 134 | GNUNET_OS_start_process (GNUNET_YES, GNUNET_OS_INHERIT_STD_OUT_AND_ERR, NULL, NULL, binary, |
140 | "gnunet-service-arm", | 135 | "gnunet-service-arm", |
141 | "-c", cfgname, NULL); | 136 | "-c", cfgname, NULL); |
142 | #endif | ||
143 | GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname)); | 137 | GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname)); |
144 | GNUNET_free (binary); | 138 | GNUNET_free (binary); |
145 | } | 139 | } |
@@ -148,7 +142,6 @@ setup_peer (struct PeerContext *p, const char *cfgname) | |||
148 | static void | 142 | static void |
149 | stop_arm (struct PeerContext *p) | 143 | stop_arm (struct PeerContext *p) |
150 | { | 144 | { |
151 | #if START_ARM | ||
152 | if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM)) | 145 | if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM)) |
153 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); | 146 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); |
154 | if (GNUNET_OS_process_wait (p->arm_proc) != GNUNET_OK) | 147 | if (GNUNET_OS_process_wait (p->arm_proc) != GNUNET_OK) |
@@ -157,7 +150,6 @@ stop_arm (struct PeerContext *p) | |||
157 | GNUNET_OS_process_get_pid (p->arm_proc)); | 150 | GNUNET_OS_process_get_pid (p->arm_proc)); |
158 | GNUNET_OS_process_destroy (p->arm_proc); | 151 | GNUNET_OS_process_destroy (p->arm_proc); |
159 | p->arm_proc = NULL; | 152 | p->arm_proc = NULL; |
160 | #endif | ||
161 | GNUNET_CONFIGURATION_destroy (p->cfg); | 153 | GNUNET_CONFIGURATION_destroy (p->cfg); |
162 | } | 154 | } |
163 | 155 | ||