commit 43b67a36baf50b13c2702a448fc623a73f9cb6e5
parent 9b9b31f8c57254434e67815ad4ad7aeda7c6cc63
Author: Christian Grothoff <christian@grothoff.org>
Date: Tue, 17 Mar 2026 00:14:52 +0100
-fix twister lib
Diffstat:
2 files changed, 19 insertions(+), 10 deletions(-)
diff --git a/src/include/taler/taler_twister_testing_lib.h b/src/include/taler/taler_twister_testing_lib.h
@@ -49,7 +49,7 @@ TALER_TWISTER_prepare_twister (const char *config_filename);
* @param config_filename configuration file name.
* @return twister process handle, NULL upon errors.
*/
-struct GNUNET_OS_Process *
+struct GNUNET_Process *
TALER_TWISTER_run_twister (const char *config_filename);
diff --git a/src/testing/testing_api_twister_helpers.c b/src/testing/testing_api_twister_helpers.c
@@ -89,11 +89,11 @@ TALER_TWISTER_prepare_twister (const char *config_filename)
* @param config_filename configuration file name.
* @return twister process handle, NULL upon errors.
*/
-struct GNUNET_OS_Process *
+struct GNUNET_Process *
TALER_TWISTER_run_twister (const char *config_filename)
{
- struct GNUNET_OS_Process *proc;
- struct GNUNET_OS_Process *client_proc;
+ struct GNUNET_Process *proc;
+ struct GNUNET_Process *client_proc;
unsigned long code;
enum GNUNET_OS_ProcessStatusType type;
@@ -139,7 +139,11 @@ TALER_TWISTER_run_twister (const char *config_filename)
GNUNET_break (GNUNET_OK ==
GNUNET_process_kill (proc,
SIGTERM));
- GNUNET_process_wait (proc);
+ GNUNET_break (GNUNET_OK ==
+ GNUNET_process_wait (proc,
+ true,
+ NULL,
+ NULL));
GNUNET_process_destroy (proc);
TWISTER_FAIL ();
}
@@ -152,7 +156,11 @@ TALER_TWISTER_run_twister (const char *config_filename)
GNUNET_break (GNUNET_OK ==
GNUNET_process_kill (proc,
SIGTERM));
- GNUNET_process_wait (proc);
+ GNUNET_break (GNUNET_OK ==
+ GNUNET_process_wait (proc,
+ true,
+ NULL,
+ NULL));
GNUNET_process_destroy (proc);
TWISTER_FAIL ();
}
@@ -165,10 +173,11 @@ TALER_TWISTER_run_twister (const char *config_filename)
GNUNET_break (GNUNET_OK ==
GNUNET_process_kill (proc,
SIGTERM));
- GNUNET_process_wait (proc,
- true,
- NULL,
- NULL);
+ GNUNET_break (GNUNET_OK ==
+ GNUNET_process_wait (proc,
+ true,
+ NULL,
+ NULL));
GNUNET_process_destroy (proc);
TWISTER_FAIL ();
}