From 3d5d5eace287c0aad4a1e9221dcebc62e2a886ee Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Wed, 11 Apr 2012 17:31:04 +0200 Subject: [PATCH] vala tests: avoid spurious failure with older GObject * t/vala2.sh: In the 'PKG_CHECK_MODULES' call in 'configure.ac', don't require gobject >= 2.10, but just >= 2.4: that is enough in order for the test to pass. * t/vala3.sh: Likewise. * t/vala5.sh: Likewise. Also, skip the test instead of failing if the ./configure invocation fails: that is likely due to the fact that the GObject library is too old or missing, and that is not automake's fault. Signed-off-by: Stefano Lattarini --- t/vala2.sh | 2 +- t/vala3.sh | 2 +- t/vala5.sh | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/t/vala2.sh b/t/vala2.sh index cceed54..2b140b5 100755 --- a/t/vala2.sh +++ b/t/vala2.sh @@ -26,7 +26,7 @@ AC_PROG_CC AM_PROG_CC_C_O AC_PROG_LIBTOOL AM_PROG_VALAC([0.7.0]) -PKG_CHECK_MODULES([GOBJECT],[gobject-2.0 >= 2.10]) +PKG_CHECK_MODULES([GOBJECT], [gobject-2.0 >= 2.4]) AC_CONFIG_FILES([src/Makefile]) AC_OUTPUT END diff --git a/t/vala3.sh b/t/vala3.sh index c93db9a..af8fcb5 100755 --- a/t/vala3.sh +++ b/t/vala3.sh @@ -26,7 +26,7 @@ AC_PROG_CC AM_PROG_CC_C_O AC_PROG_LIBTOOL AM_PROG_VALAC([0.7.0]) -PKG_CHECK_MODULES([GOBJECT],[gobject-2.0 >= 2.10]) +PKG_CHECK_MODULES([GOBJECT], [gobject-2.0 >= 2.4]) AC_OUTPUT END diff --git a/t/vala5.sh b/t/vala5.sh index 79fb316..26f391a 100755 --- a/t/vala5.sh +++ b/t/vala5.sh @@ -25,7 +25,7 @@ cat >> configure.ac <<'END' AC_PROG_CC AM_PROG_CC_C_O AM_PROG_VALAC([0.7.0]) -PKG_CHECK_MODULES([GOBJECT], [gobject-2.0 >= 2.10]) +PKG_CHECK_MODULES([GOBJECT], [gobject-2.0 >= 2.4]) AC_CONFIG_FILES([src/Makefile]) AC_OUTPUT END @@ -70,7 +70,7 @@ $AUTOMAKE -a grep PKG_CHECK_MODULES configure && skip_ "pkg-config m4 macros not found" -./configure +./configure || skip_ "configure failure" $MAKE if cross_compiling; then :; else -- 2.7.4