aboutsummaryrefslogtreecommitdiff
path: root/src/testing
diff options
context:
space:
mode:
authorSree Harsha Totakura <totakura@in.tum.de>2013-11-28 16:19:02 +0000
committerSree Harsha Totakura <totakura@in.tum.de>2013-11-28 16:19:02 +0000
commite82e35960347d2cd4368144d167a0077673264f5 (patch)
treec6fd52cdd3345efc7061a41dd2ef024114a84f3a /src/testing
parent4171e37d173379f6d95589f64f97388ba899984a (diff)
downloadgnunet-e82e35960347d2cd4368144d167a0077673264f5.tar.gz
gnunet-e82e35960347d2cd4368144d167a0077673264f5.zip
- support PREFIX strings with arguments
Diffstat (limited to 'src/testing')
-rw-r--r--src/testing/testing.c19
1 files changed, 10 insertions, 9 deletions
diff --git a/src/testing/testing.c b/src/testing/testing.c
index c21f523ea..dd6805396 100644
--- a/src/testing/testing.c
+++ b/src/testing/testing.c
@@ -34,6 +34,8 @@
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
37#define LOG(kind,...) \ 39#define LOG(kind,...) \
38 GNUNET_log_from (kind, "testing-api", __VA_ARGS__) 40 GNUNET_log_from (kind, "testing-api", __VA_ARGS__)
39 41
@@ -1320,15 +1322,14 @@ GNUNET_TESTING_peer_start (struct GNUNET_TESTING_Peer *peer)
1320 return GNUNET_SYSERR; 1322 return GNUNET_SYSERR;
1321 i->n_refs++; 1323 i->n_refs++;
1322 } 1324 }
1323 peer->main_process = GNUNET_OS_start_process (PIPE_CONTROL, 1325 peer->main_process = do_start_process (PIPE_CONTROL,
1324 GNUNET_OS_INHERIT_STD_OUT_AND_ERR, 1326 GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
1325 NULL, NULL, 1327 NULL,
1326 peer->main_binary, 1328 peer->main_binary,
1327 peer->main_binary, 1329 peer->args,
1328 peer->args, 1330 "-c",
1329 "-c", 1331 peer->cfgfile,
1330 peer->cfgfile, 1332 NULL);
1331 NULL);
1332 if (NULL == peer->main_process) 1333 if (NULL == peer->main_process)
1333 { 1334 {
1334 GNUNET_log (GNUNET_ERROR_TYPE_ERROR, 1335 GNUNET_log (GNUNET_ERROR_TYPE_ERROR,