[glib: 4/4] Merge branch 'gsubprocess-communicate-utf8-tests' into 'master'

[Philip Withnall <pwithnall src gnome org>]

commit 0b80445b0c20609ef110234fe10173796178bda8
Merge: a81aa3cb9 19c7a7bb2
Author: Philip Withnall <philip tecnocode co uk>
Date:   Wed Dec 19 13:15:04 2018 +0000

    Merge branch 'gsubprocess-communicate-utf8-tests' into 'master'
    
    Add UTF-8 communication tests for GSubprocess
    
    See merge request GNOME/glib!381

 gio/gsubprocess.c                | 18 ++++++++++++++++--
 gio/tests/gsubprocess-testprog.c |  7 ++++++-
 gio/tests/gsubprocess.c          | 34 +++++++++++++++++++++++++++++++++-
 3 files changed, 55 insertions(+), 4 deletions(-)
---
diff --cc gio/tests/gsubprocess-testprog.c
index 8d032540c,c9b06c2a2..6794cb375
--- a/gio/tests/gsubprocess-testprog.c
+++ b/gio/tests/gsubprocess-testprog.c
@@@ -203,10 -204,13 +204,14 @@@ main (int argc, char **argv
  
    context = g_option_context_new ("MODE - Test GSubprocess stuff");
    g_option_context_add_main_entries (context, options, NULL);
-   if (!g_option_context_parse (context, &argc, &argv, &error))
+   ret = g_option_context_parse (context, &argc, &argv, &error);
+   g_option_context_free (context);
+ 
+   if (!ret)
      {
 +      g_option_context_free (context);
        g_printerr ("%s: %s\n", argv[0], error->message);
+       g_error_free (error);
        return 1;
      }