diff options
author | Christian Grothoff <christian@grothoff.org> | 2023-06-07 23:11:05 +0200 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2023-06-07 23:11:05 +0200 |
commit | a2dde02b64a8ee75c9243632eb45a6ceb9b62dd5 (patch) | |
tree | 378cb6aefaf7f00894a7c8916fad9c3de84e31b4 /src/testing/testing_api_cmd_system_start.c | |
parent | 015b08b0489d72f3fda587eec900bc4193a6a57e (diff) | |
download | exchange-a2dde02b64a8ee75c9243632eb45a6ceb9b62dd5.tar.xz |
major libtalertesting API refactoring, including no longer having taler-specific logic in the test engine core
Diffstat (limited to 'src/testing/testing_api_cmd_system_start.c')
-rw-r--r-- | src/testing/testing_api_cmd_system_start.c | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/src/testing/testing_api_cmd_system_start.c b/src/testing/testing_api_cmd_system_start.c index 491f03c56..2f5a9a8e3 100644 --- a/src/testing/testing_api_cmd_system_start.c +++ b/src/testing/testing_api_cmd_system_start.c @@ -163,14 +163,19 @@ read_stdout (void *cls) "Child closed stdout\n"); return; } + /* forward log, except single '.' outputs */ + if ( (1 != ret) || + ('.' != buf[off]) ) + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "TUS: %.*s\n", + (int) ret, + &buf[off]); start_reader (as); off += ret; if (as->ready) { - GNUNET_log (GNUNET_ERROR_TYPE_INFO, - "Taler system UP\n"); - TALER_TESTING_interpreter_next (as->is); - return; /* done */ + /* already done */ + return; } if (NULL != memmem (buf, @@ -178,7 +183,10 @@ read_stdout (void *cls) "\n<<READY>>\n", strlen ("\n<<READY>>\n"))) { + GNUNET_log (GNUNET_ERROR_TYPE_INFO, + "Taler system UP\n"); as->ready = true; + TALER_TESTING_interpreter_next (as->is); return; } @@ -226,7 +234,7 @@ system_run (void *cls, (void) cmd; as->is = is; - as->pipe_in = GNUNET_DISK_pipe (GNUNET_DISK_PF_NONE); + as->pipe_in = GNUNET_DISK_pipe (GNUNET_DISK_PF_BLOCKING_READ); GNUNET_assert (NULL != as->pipe_in); as->pipe_out = GNUNET_DISK_pipe (GNUNET_DISK_PF_NONE); GNUNET_assert (NULL != as->pipe_out); @@ -234,7 +242,7 @@ system_run (void *cls, = GNUNET_OS_start_process_vap ( GNUNET_OS_INHERIT_STD_ERR, as->pipe_in, as->pipe_out, NULL, - "taler-benchmark-setup.sh", + "taler-unified-setup.sh", as->args); if (NULL == as->system_proc) { @@ -357,7 +365,7 @@ TALER_TESTING_cmd_system_start ( va_end (ap); as->args = GNUNET_new_array (cnt, char *); - as->args[0] = GNUNET_strdup ("taler-benchmark-setup"); + as->args[0] = GNUNET_strdup ("taler-unified-setup"); as->args[1] = GNUNET_strdup ("-c"); as->args[2] = GNUNET_strdup (config_file); cnt = 3; |