Fix: remove g_spawn_check_exit_status to support glib 2.22

Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>

diff --git a/tests/lib/test_ctf_writer.c b/tests/lib/test_ctf_writer.c
index 3d24ea41c8c09fa2a806c9fc7c00937e276a50a8..8b502d379e33168d22d75da92969298936f6ab8e 100644 (file)
--- a/tests/lib/test_ctf_writer.c
+++ b/tests/lib/test_ctf_writer.c
@@ -122,10 +122,16 @@ void validate_trace(char *parser_path, char *trace_path)
                goto result;
        }
 
-       if(!g_spawn_check_exit_status(exit_status, NULL)) {
+       /* Replace by g_spawn_check_exit_status when we require glib >= 2.34 */
+#if G_OS_UNIX
+       ret = WIFEXITED(exit_status) ? WEXITSTATUS(exit_status) : -1;
+#else
+       ret = exit_status;
+#endif
+
+       if (ret != 0) {
                diag("Babeltrace returned an error.");
                diag_multiline(standard_error);
-               ret = -1;
                goto result;
        }