automake-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[FYI] {master} vala tests: avoid spurious failure with older GObject


From: Stefano Lattarini
Subject: [FYI] {master} vala tests: avoid spurious failure with older GObject
Date: Wed, 11 Apr 2012 17:37:01 +0200

* 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 <address@hidden>
---
 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
-- 
1.7.9




reply via email to

[Prev in Thread] Current Thread [Next in Thread]