diff options
author | Sree Harsha Totakura <totakura@in.tum.de> | 2013-11-29 10:25:47 +0000 |
---|---|---|
committer | Sree Harsha Totakura <totakura@in.tum.de> | 2013-11-29 10:25:47 +0000 |
commit | d5f83fb8b9a2ae2797b7b0e46bf6cd346743f4b3 (patch) | |
tree | a9afdf6ba9fcc2051a5043b061ea9dc86779fb9f /src/testing | |
parent | b0c50f22c52535650a7288c32a3ae3ed6336c32f (diff) | |
download | gnunet-d5f83fb8b9a2ae2797b7b0e46bf6cd346743f4b3.tar.gz gnunet-d5f83fb8b9a2ae2797b7b0e46bf6cd346743f4b3.zip |
- move do_start_process to util/
Diffstat (limited to 'src/testing')
-rw-r--r-- | src/testing/testing.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/src/testing/testing.c b/src/testing/testing.c index 9d54b4c53..62f9cb1a3 100644 --- a/src/testing/testing.c +++ b/src/testing/testing.c | |||
@@ -34,8 +34,6 @@ | |||
34 | #include "gnunet_arm_service.h" | 34 | #include "gnunet_arm_service.h" |
35 | #include "gnunet_testing_lib.h" | 35 | #include "gnunet_testing_lib.h" |
36 | 36 | ||
37 | #include "../arm/do_start_process.c" | ||
38 | |||
39 | #define LOG(kind,...) \ | 37 | #define LOG(kind,...) \ |
40 | GNUNET_log_from (kind, "testing-api", __VA_ARGS__) | 38 | GNUNET_log_from (kind, "testing-api", __VA_ARGS__) |
41 | 39 | ||
@@ -1254,7 +1252,6 @@ GNUNET_TESTING_peer_configure (struct GNUNET_TESTING_System *system, | |||
1254 | } | 1252 | } |
1255 | else | 1253 | else |
1256 | { | 1254 | { |
1257 | peer->main_binary = GNUNET_CONFIGURATION_expand_dollar (peer->cfg, peer->main_binary); | ||
1258 | peer->args = strdup (libexec_binary); | 1255 | peer->args = strdup (libexec_binary); |
1259 | } | 1256 | } |
1260 | peer->system = system; | 1257 | peer->system = system; |
@@ -1325,14 +1322,15 @@ GNUNET_TESTING_peer_start (struct GNUNET_TESTING_Peer *peer) | |||
1325 | return GNUNET_SYSERR; | 1322 | return GNUNET_SYSERR; |
1326 | i->n_refs++; | 1323 | i->n_refs++; |
1327 | } | 1324 | } |
1328 | peer->main_process = do_start_process (PIPE_CONTROL, | 1325 | peer->main_binary = GNUNET_CONFIGURATION_expand_dollar (peer->cfg, peer->main_binary); |
1329 | GNUNET_OS_INHERIT_STD_OUT_AND_ERR, | 1326 | peer->main_process = GNUNET_OS_start_process_s (PIPE_CONTROL, |
1330 | NULL, | 1327 | GNUNET_OS_INHERIT_STD_OUT_AND_ERR, |
1331 | peer->main_binary, | 1328 | NULL, |
1332 | peer->args, | 1329 | peer->main_binary, |
1333 | "-c", | 1330 | peer->args, |
1334 | peer->cfgfile, | 1331 | "-c", |
1335 | NULL); | 1332 | peer->cfgfile, |
1333 | NULL); | ||
1336 | if (NULL == peer->main_process) | 1334 | if (NULL == peer->main_process) |
1337 | { | 1335 | { |
1338 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 1336 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |