Skip to contentSkip to conversation

Fix: remove g_spawn_check_exit_status to support glib 2.22

PATCH Jérémie Galarneau 1 participant 1 message Aug 31, 2017 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

Jérémie Galarneau

author Applied
#1 lore raw

Merged, thanks!

Jérémie

Quoted 31 lines · Michael Jeanson
---
 tests/lib/test_ctf_writer.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
tests/lib/test_ctf_writer.c +8 -3
index 3d24ea4..9c65d84 100644
@@ -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;
        }
 
--

2.7.4

Signature · 7 lines
Jérémie Galarneau
EfficiOS Inc.
http://www.efficios.com
_______________________________________________
lttng-dev mailing list
[email protected]
https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev