aboutsummaryrefslogtreecommitdiff
path: root/src/testing_old/testing.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/testing_old/testing.c')
-rw-r--r--src/testing_old/testing.c38
1 files changed, 19 insertions, 19 deletions
diff --git a/src/testing_old/testing.c b/src/testing_old/testing.c
index 5456d56cb..1b164aa0f 100644
--- a/src/testing_old/testing.c
+++ b/src/testing_old/testing.c
@@ -245,7 +245,7 @@ start_fsm (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
245 "gnunet-peerinfo", "gnunet-peerinfo", "-c", d->cfgfile, 245 "gnunet-peerinfo", "gnunet-peerinfo", "-c", d->cfgfile,
246 "-sq"); 246 "-sq");
247 d->proc_arm_peerinfo = 247 d->proc_arm_peerinfo =
248 GNUNET_OS_start_process (GNUNET_YES, NULL, d->pipe_stdout, "gnunet-peerinfo", 248 GNUNET_OS_start_process (GNUNET_YES, GNUNET_OS_INHERIT_STD_OUT_AND_ERR, NULL, d->pipe_stdout, "gnunet-peerinfo",
249 "gnunet-peerinfo", "-c", d->cfgfile, "-sq", 249 "gnunet-peerinfo", "-c", d->cfgfile, "-sq",
250 NULL); 250 NULL);
251 GNUNET_DISK_pipe_close_end (d->pipe_stdout, GNUNET_DISK_PIPE_END_WRITE); 251 GNUNET_DISK_pipe_close_end (d->pipe_stdout, GNUNET_DISK_PIPE_END_WRITE);
@@ -263,7 +263,7 @@ start_fsm (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
263 d->cfgfile, "-sq"); 263 d->cfgfile, "-sq");
264 if (d->ssh_port_str == NULL) 264 if (d->ssh_port_str == NULL)
265 { 265 {
266 d->proc_arm_peerinfo = GNUNET_OS_start_process (GNUNET_NO, NULL, d->pipe_stdout, "ssh", "ssh", 266 d->proc_arm_peerinfo = GNUNET_OS_start_process (GNUNET_NO, GNUNET_OS_INHERIT_STD_OUT_AND_ERR, NULL, d->pipe_stdout, "ssh", "ssh",
267 "-q", 267 "-q",
268 dst, "gnunet-peerinfo", "-c", 268 dst, "gnunet-peerinfo", "-c",
269 d->cfgfile, "-sq", NULL); 269 d->cfgfile, "-sq", NULL);
@@ -271,7 +271,7 @@ start_fsm (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
271 else 271 else
272 { 272 {
273 d->proc_arm_peerinfo = 273 d->proc_arm_peerinfo =
274 GNUNET_OS_start_process (GNUNET_NO, NULL, d->pipe_stdout, "ssh", "ssh", "-p", 274 GNUNET_OS_start_process (GNUNET_NO, GNUNET_OS_INHERIT_STD_OUT_AND_ERR, NULL, d->pipe_stdout, "ssh", "ssh", "-p",
275 d->ssh_port_str, 275 d->ssh_port_str,
276 "-q", 276 "-q",
277 dst, "gnunet-peerinfo", "-c", d->cfgfile, 277 dst, "gnunet-peerinfo", "-c", d->cfgfile,
@@ -414,7 +414,7 @@ start_fsm (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
414 "gnunet-arm", "gnunet-arm", "-c", d->cfgfile, 414 "gnunet-arm", "gnunet-arm", "-c", d->cfgfile,
415 "-s"); 415 "-s");
416 d->proc_arm_start = 416 d->proc_arm_start =
417 GNUNET_OS_start_process (GNUNET_YES, NULL, NULL, "gnunet-arm", "gnunet-arm", "-c", 417 GNUNET_OS_start_process (GNUNET_YES, GNUNET_OS_INHERIT_STD_OUT_AND_ERR, NULL, NULL, "gnunet-arm", "gnunet-arm", "-c",
418 d->cfgfile, 418 d->cfgfile,
419 "-s", "-q", "-T", 419 "-s", "-q", "-T",
420 GNUNET_TIME_relative_to_string 420 GNUNET_TIME_relative_to_string
@@ -434,7 +434,7 @@ start_fsm (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
434 "-s", "-q"); 434 "-s", "-q");
435 if (d->ssh_port_str == NULL) 435 if (d->ssh_port_str == NULL)
436 { 436 {
437 d->proc_arm_start = GNUNET_OS_start_process (GNUNET_NO, NULL, NULL, "ssh", "ssh", 437 d->proc_arm_start = GNUNET_OS_start_process (GNUNET_NO, GNUNET_OS_INHERIT_STD_OUT_AND_ERR, NULL, NULL, "ssh", "ssh",
438 "-q", 438 "-q",
439 dst, "gnunet-arm", 439 dst, "gnunet-arm",
440 "-c", d->cfgfile, "-s", "-q", "-T", 440 "-c", d->cfgfile, "-s", "-q", "-T",
@@ -446,7 +446,7 @@ start_fsm (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
446 { 446 {
447 447
448 d->proc_arm_start = 448 d->proc_arm_start =
449 GNUNET_OS_start_process (GNUNET_NO, NULL, NULL, "ssh", "ssh", "-p", 449 GNUNET_OS_start_process (GNUNET_NO, GNUNET_OS_INHERIT_STD_OUT_AND_ERR, NULL, NULL, "ssh", "ssh", "-p",
450 d->ssh_port_str, 450 d->ssh_port_str,
451 "-q", 451 "-q",
452 dst, "gnunet-arm", 452 dst, "gnunet-arm",
@@ -892,7 +892,7 @@ GNUNET_TESTING_daemon_start_stopped_service (struct GNUNET_TESTING_Daemon *d,
892 else 892 else
893 arg = GNUNET_strdup (d->hostname); 893 arg = GNUNET_strdup (d->hostname);
894 894
895 d->proc_arm_srv_start = GNUNET_OS_start_process (GNUNET_NO, NULL, NULL, "ssh", "ssh", 895 d->proc_arm_srv_start = GNUNET_OS_start_process (GNUNET_NO, GNUNET_OS_INHERIT_STD_OUT_AND_ERR, NULL, NULL, "ssh", "ssh",
896 "-q", 896 "-q",
897 arg, "gnunet-arm", 897 arg, "gnunet-arm",
898 "-c", d->cfgfile, "-i", service, "-q", 898 "-c", d->cfgfile, "-i", service, "-q",
@@ -908,7 +908,7 @@ GNUNET_TESTING_daemon_start_stopped_service (struct GNUNET_TESTING_Daemon *d,
908 { 908 {
909 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 909 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
910 "Starting gnunet-arm with config `%s' locally.\n", d->cfgfile); 910 "Starting gnunet-arm with config `%s' locally.\n", d->cfgfile);
911 d->proc_arm_srv_start = GNUNET_OS_start_process (GNUNET_YES, NULL, NULL, "gnunet-arm", "gnunet-arm", 911 d->proc_arm_srv_start = GNUNET_OS_start_process (GNUNET_YES, GNUNET_OS_INHERIT_STD_OUT_AND_ERR, NULL, NULL, "gnunet-arm", "gnunet-arm",
912 "-c", d->cfgfile, "-i", service, "-q", 912 "-c", d->cfgfile, "-i", service, "-q",
913 "-T", 913 "-T",
914 GNUNET_TIME_relative_to_string (timeout), 914 GNUNET_TIME_relative_to_string (timeout),
@@ -960,7 +960,7 @@ GNUNET_TESTING_daemon_start_service (struct GNUNET_TESTING_Daemon *d,
960 else 960 else
961 arg = GNUNET_strdup (d->hostname); 961 arg = GNUNET_strdup (d->hostname);
962 962
963 d->proc_arm_srv_start = GNUNET_OS_start_process (GNUNET_NO, NULL, NULL, "ssh", "ssh", 963 d->proc_arm_srv_start = GNUNET_OS_start_process (GNUNET_NO, GNUNET_OS_INHERIT_STD_OUT_AND_ERR, NULL, NULL, "ssh", "ssh",
964 "-q", 964 "-q",
965 arg, "gnunet-arm", 965 arg, "gnunet-arm",
966 "-c", d->cfgfile, "-i", service, "-q", 966 "-c", d->cfgfile, "-i", service, "-q",
@@ -977,7 +977,7 @@ GNUNET_TESTING_daemon_start_service (struct GNUNET_TESTING_Daemon *d,
977 { 977 {
978 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 978 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
979 "Starting gnunet-arm with config `%s' locally.\n", d->cfgfile); 979 "Starting gnunet-arm with config `%s' locally.\n", d->cfgfile);
980 d->proc_arm_srv_start = GNUNET_OS_start_process (GNUNET_YES, NULL, NULL, "gnunet-arm", "gnunet-arm", 980 d->proc_arm_srv_start = GNUNET_OS_start_process (GNUNET_YES, GNUNET_OS_INHERIT_STD_OUT_AND_ERR, NULL, NULL, "gnunet-arm", "gnunet-arm",
981 "-c", d->cfgfile, "-i", service, "-q", 981 "-c", d->cfgfile, "-i", service, "-q",
982 "-T", 982 "-T",
983 GNUNET_TIME_relative_to_string (timeout), 983 GNUNET_TIME_relative_to_string (timeout),
@@ -1184,7 +1184,7 @@ GNUNET_TESTING_daemon_start (const struct GNUNET_CONFIGURATION_Handle *cfg,
1184 GNUNET_free (baseservicehome); 1184 GNUNET_free (baseservicehome);
1185 if (ret->ssh_port_str == NULL) 1185 if (ret->ssh_port_str == NULL)
1186 { 1186 {
1187 ret->proc_arm_copying = GNUNET_OS_start_process (GNUNET_NO, NULL, NULL, "scp", "scp", "-r", 1187 ret->proc_arm_copying = GNUNET_OS_start_process (GNUNET_NO, GNUNET_OS_INHERIT_STD_OUT_AND_ERR, NULL, NULL, "scp", "scp", "-r",
1188 "-q", 1188 "-q",
1189 servicehome, arg, NULL); 1189 servicehome, arg, NULL);
1190 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 1190 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -1194,7 +1194,7 @@ GNUNET_TESTING_daemon_start (const struct GNUNET_CONFIGURATION_Handle *cfg,
1194 else 1194 else
1195 { 1195 {
1196 ret->proc_arm_copying = 1196 ret->proc_arm_copying =
1197 GNUNET_OS_start_process (GNUNET_NO, NULL, NULL, "scp", "scp", "-r", "-P", 1197 GNUNET_OS_start_process (GNUNET_NO, GNUNET_OS_INHERIT_STD_OUT_AND_ERR, NULL, NULL, "scp", "scp", "-r", "-P",
1198 ret->ssh_port_str, 1198 ret->ssh_port_str,
1199 "-q", 1199 "-q",
1200 servicehome, arg, NULL); 1200 servicehome, arg, NULL);
@@ -1304,7 +1304,7 @@ GNUNET_TESTING_daemon_restart (struct GNUNET_TESTING_Daemon *d,
1304 else 1304 else
1305 arg = GNUNET_strdup (d->hostname); 1305 arg = GNUNET_strdup (d->hostname);
1306 1306
1307 d->proc_arm_stop = GNUNET_OS_start_process (GNUNET_NO, NULL, NULL, "ssh", "ssh", 1307 d->proc_arm_stop = GNUNET_OS_start_process (GNUNET_NO, GNUNET_OS_INHERIT_STD_OUT_AND_ERR, NULL, NULL, "ssh", "ssh",
1308 "-q", 1308 "-q",
1309 arg, "gnunet-arm", 1309 arg, "gnunet-arm",
1310 "-c", d->cfgfile, "-e", "-r", NULL); 1310 "-c", d->cfgfile, "-e", "-r", NULL);
@@ -1316,7 +1316,7 @@ GNUNET_TESTING_daemon_restart (struct GNUNET_TESTING_Daemon *d,
1316 { 1316 {
1317 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 1317 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
1318 "Stopping gnunet-arm with config `%s' locally.\n", d->cfgfile); 1318 "Stopping gnunet-arm with config `%s' locally.\n", d->cfgfile);
1319 d->proc_arm_stop = GNUNET_OS_start_process (GNUNET_YES, NULL, NULL, "gnunet-arm", "gnunet-arm", 1319 d->proc_arm_stop = GNUNET_OS_start_process (GNUNET_YES, GNUNET_OS_INHERIT_STD_OUT_AND_ERR, NULL, NULL, "gnunet-arm", "gnunet-arm",
1320 "-c", d->cfgfile, "-e", "-r", NULL); 1320 "-c", d->cfgfile, "-e", "-r", NULL);
1321 } 1321 }
1322 1322
@@ -1377,7 +1377,7 @@ GNUNET_TESTING_daemon_stop_service (struct GNUNET_TESTING_Daemon *d,
1377 else 1377 else
1378 arg = GNUNET_strdup (d->hostname); 1378 arg = GNUNET_strdup (d->hostname);
1379 1379
1380 d->proc_arm_srv_stop = GNUNET_OS_start_process (GNUNET_NO, NULL, NULL, "ssh", "ssh", 1380 d->proc_arm_srv_stop = GNUNET_OS_start_process (GNUNET_NO, GNUNET_OS_INHERIT_STD_OUT_AND_ERR, NULL, NULL, "ssh", "ssh",
1381 "-q", 1381 "-q",
1382 arg, "gnunet-arm", 1382 arg, "gnunet-arm",
1383 "-c", d->cfgfile, "-k", service, "-q", 1383 "-c", d->cfgfile, "-k", service, "-q",
@@ -1393,7 +1393,7 @@ GNUNET_TESTING_daemon_stop_service (struct GNUNET_TESTING_Daemon *d,
1393 { 1393 {
1394 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 1394 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
1395 "Stopping gnunet-arm with config `%s' locally.\n", d->cfgfile); 1395 "Stopping gnunet-arm with config `%s' locally.\n", d->cfgfile);
1396 d->proc_arm_srv_stop = GNUNET_OS_start_process (GNUNET_YES, NULL, NULL, "gnunet-arm", "gnunet-arm", 1396 d->proc_arm_srv_stop = GNUNET_OS_start_process (GNUNET_YES, GNUNET_OS_INHERIT_STD_OUT_AND_ERR, NULL, NULL, "gnunet-arm", "gnunet-arm",
1397 "-c", d->cfgfile, "-k", service, "-q", 1397 "-c", d->cfgfile, "-k", service, "-q",
1398 "-T", 1398 "-T",
1399 GNUNET_TIME_relative_to_string (timeout), 1399 GNUNET_TIME_relative_to_string (timeout),
@@ -1546,7 +1546,7 @@ GNUNET_TESTING_daemon_stop (struct GNUNET_TESTING_Daemon *d,
1546 else 1546 else
1547 arg = GNUNET_strdup (d->hostname); 1547 arg = GNUNET_strdup (d->hostname);
1548 1548
1549 d->proc_arm_stop = GNUNET_OS_start_process (GNUNET_NO, NULL, NULL, "ssh", "ssh", 1549 d->proc_arm_stop = GNUNET_OS_start_process (GNUNET_NO, GNUNET_OS_INHERIT_STD_OUT_AND_ERR, NULL, NULL, "ssh", "ssh",
1550 "-q", 1550 "-q",
1551 arg, "gnunet-arm", 1551 arg, "gnunet-arm",
1552 "-c", d->cfgfile, "-e", "-q", "-T", 1552 "-c", d->cfgfile, "-e", "-q", "-T",
@@ -1562,7 +1562,7 @@ GNUNET_TESTING_daemon_stop (struct GNUNET_TESTING_Daemon *d,
1562 { 1562 {
1563 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 1563 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
1564 "Stopping gnunet-arm with config `%s' locally.\n", d->cfgfile); 1564 "Stopping gnunet-arm with config `%s' locally.\n", d->cfgfile);
1565 d->proc_arm_stop = GNUNET_OS_start_process (GNUNET_NO, NULL, NULL, "gnunet-arm", "gnunet-arm", 1565 d->proc_arm_stop = GNUNET_OS_start_process (GNUNET_NO, GNUNET_OS_INHERIT_STD_OUT_AND_ERR, NULL, NULL, "gnunet-arm", "gnunet-arm",
1566 "-c", d->cfgfile, "-e", "-q", "-T", 1566 "-c", d->cfgfile, "-e", "-q", "-T",
1567 GNUNET_TIME_relative_to_string (timeout), 1567 GNUNET_TIME_relative_to_string (timeout),
1568 del_arg, NULL); 1568 del_arg, NULL);
@@ -1626,7 +1626,7 @@ GNUNET_TESTING_daemon_reconfigure (struct GNUNET_TESTING_Daemon *d,
1626 GNUNET_asprintf (&arg, "%s@%s:%s", d->username, d->hostname, d->cfgfile); 1626 GNUNET_asprintf (&arg, "%s@%s:%s", d->username, d->hostname, d->cfgfile);
1627 else 1627 else
1628 GNUNET_asprintf (&arg, "%s:%s", d->hostname, d->cfgfile); 1628 GNUNET_asprintf (&arg, "%s:%s", d->hostname, d->cfgfile);
1629 d->proc_arm_copying = GNUNET_OS_start_process (GNUNET_NO, NULL, NULL, "scp", "scp", 1629 d->proc_arm_copying = GNUNET_OS_start_process (GNUNET_NO, GNUNET_OS_INHERIT_STD_OUT_AND_ERR, NULL, NULL, "scp", "scp",
1630 "-q", 1630 "-q",
1631 d->cfgfile, arg, NULL); 1631 d->cfgfile, arg, NULL);
1632 GNUNET_free (arg); 1632 GNUNET_free (arg);
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-13 12:01:51 +0000