aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEduardo Habkost <ehabkost@redhat.com>2016-06-14 13:00:23 -0300
committerMichael Tokarev <mjt@tls.msk.ru>2016-09-15 15:32:22 +0300
commit7ad9339e372fcd12d584684d7f52ac259604a4f4 (patch)
tree9538e60e08929f921a377c18365484ee4137a399
parent11d816a5bc3eedfdb079b158d62867bf78ff30fc (diff)
win32: don't run subprocess tests on Mingw32 platform
On Tue, Jun 14, 2016 at 04:44:57PM +0100, Daniel P. Berrange wrote: > The g_test_trap_subprocess() method does not work on the > Mingw32 platform, causing the test-qdev-global-props > test case to abort > > (test-logging.exe:230): GLib-ERROR **: g_test_trap_subprocess() > failed: Failed to execute helper program (No such file or directory) > > This failure was introduced a while ago in > > commit 2177801a4899bf29108b3d471417a5b4d701ec29 > Author: Eduardo Habkost <ehabkost@redhat.com> > Date: Fri Aug 8 16:03:27 2014 -0300 > > test-qdev-global-props: Run tests on subprocess > > Modify the configure time check to avoid enabling this feature > on Mingw, rather than trying to rewrite the test to avoid this > feature. I would do the following instead, just in case we have extra code looking at $glib_subprocess one day. Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
-rwxr-xr-xconfigure2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure b/configure
index 48593280a9..7d083bdd85 100755
--- a/configure
+++ b/configure
@@ -3014,7 +3014,7 @@ fi
# g_test_trap_subprocess added in 2.38. Used by some tests.
glib_subprocess=yes
-if ! $pkg_config --atleast-version=2.38 glib-2.0; then
+if test "$mingw32" = "yes" || ! $pkg_config --atleast-version=2.38 glib-2.0; then
glib_subprocess=no
fi