From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60807) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XUgFV-0003yH-M4 for qemu-devel@nongnu.org; Thu, 18 Sep 2014 14:16:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XUgFQ-0005md-3n for qemu-devel@nongnu.org; Thu, 18 Sep 2014 14:16:09 -0400 Received: from mx1.redhat.com ([209.132.183.28]:8461) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XUgFP-0005lk-Rt for qemu-devel@nongnu.org; Thu, 18 Sep 2014 14:16:04 -0400 Date: Thu, 18 Sep 2014 21:19:09 +0300 From: "Michael S. Tsirkin" Message-ID: <1411063757-29216-16-git-send-email-mst@redhat.com> References: <1411063757-29216-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <1411063757-29216-1-git-send-email-mst@redhat.com> Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL v2 15/15] tests: disable global props test for old glib List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Anthony Liguori , Stefan Weil , Michael Tokarev , Luiz Capitulino , Stefan Hajnoczi , Paolo Bonzini , =?us-ascii?B?PT9VVEYtOD9xP0FuZHJlYXM9MjBGPUMzPUE0cmJlcj89?= tests/test-qdev-global-props.c: In function =E2=80=98test_static_prop=E2=80=99: tests/test-qdev-global-props.c:80:5: error: implicit declaration of function =E2=80=98g_test_trap_subprocess=E2=80=99 [-Werror=3Dimplicit-function-declaration] tests/test-qdev-global-props.c:80:5: error: nested extern declaration of =E2=80=98g_test_trap_subprocess=E2=80=99 [-Werror=3Dnested= -externs] This function was only added in glib 2.38, and our minimum version is 2.12. To fix, disable the test for glib < 2.38. Reported-by: Peter Maydell Signed-off-by: Michael S. Tsirkin --- configure | 9 +++++++++ tests/Makefile | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 961bf6f..6f1284a 100755 --- a/configure +++ b/configure @@ -2716,6 +2716,12 @@ for i in $glib_modules; do fi done =20 +# g_test_trap_subprocess added in 2.38. Used by some tests. +glib_subprocess=3Dyes +if ! $pkg_config --atleast-version=3D2.38 glib-2.0; then + glib_subprocess=3Dno +fi + ########################################## # SHA command probe for modules if test "$modules" =3D yes; then @@ -4585,6 +4591,9 @@ if test "$bluez" =3D "yes" ; then echo "CONFIG_BLUEZ=3Dy" >> $config_host_mak echo "BLUEZ_CFLAGS=3D$bluez_cflags" >> $config_host_mak fi +if test "glib_subprocess" =3D "yes" ; then + echo "CONFIG_HAS_GLIB_SUBPROCESS_TESTS=3Dy" >> $config_host_mak +fi echo "GLIB_CFLAGS=3D$glib_cflags" >> $config_host_mak if test "$gtk" =3D "yes" ; then echo "CONFIG_GTK=3Dy" >> $config_host_mak diff --git a/tests/Makefile b/tests/Makefile index d5db97b..a5e3d0c 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -58,7 +58,7 @@ check-unit-y +=3D tests/test-int128$(EXESUF) # all code tested by test-int128 is inside int128.h gcov-files-test-int128-y =3D check-unit-y +=3D tests/test-bitops$(EXESUF) -check-unit-y +=3D tests/test-qdev-global-props$(EXESUF) +check-unit-$(CONFIG_HAS_GLIB_SUBPROCESS_TESTS) +=3D tests/test-qdev-glob= al-props$(EXESUF) check-unit-y +=3D tests/check-qom-interface$(EXESUF) gcov-files-check-qom-interface-y =3D qom/object.c check-unit-$(CONFIG_POSIX) +=3D tests/test-vmstate$(EXESUF) --=20 MST