Tests: erroneous usage of if preprocessor directive

[babeltrace.git] / tests / lib / test_ctf_writer.c

diff --git a/tests/lib/test_ctf_writer.c b/tests/lib/test_ctf_writer.c
index 0a09e2443fd74dfb4991df0c210c4b6a32ec9e59..2eac697c7b17becb7c6d1f8d53c79fb1d100c288 100644 (file)
--- a/tests/lib/test_ctf_writer.c
+++ b/tests/lib/test_ctf_writer.c
@@ -98,7 +98,7 @@ static
 void validate_trace(char *parser_path, char *trace_path)
 {
        int ret = 0;
-       gchar *standard_error;
+       gchar *standard_error = NULL;
        gint exit_status;
        char *argv[] = {parser_path, trace_path, NULL};
 
@@ -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 */
+#ifdef 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;
        }