[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[FYI] {master} vala tests: few adjustments and improvements
From: |
Stefano Lattarini |
Subject: |
[FYI] {master} vala tests: few adjustments and improvements |
Date: |
Mon, 16 Apr 2012 19:25:03 +0200 |
* t/vala4.sh: Don't run 'libtoolize', it's not truly required.
($required): Don't require 'libtoolize'.
(configure.ac): Don't invoke 'AC_PROG_LIBTOOL'.
* t/vala-mix.sh ($required): Require 'cc'.
Avoid some calls to 'framework_failure_', they were only useful when
this test was xfailing (to ensure it wasn't failing for the wrong
reasons).
Ensure the stamp file is created in the source directory.
Signed-off-by: Stefano Lattarini <address@hidden>
---
t/vala-vpath.sh | 10 ++++++----
t/vala4.sh | 3 ---
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/t/vala-vpath.sh b/t/vala-vpath.sh
index a968afa..e1e2e66 100755
--- a/t/vala-vpath.sh
+++ b/t/vala-vpath.sh
@@ -17,7 +17,7 @@
# Test to make sure vala support handles from-scratch VPATH builds.
# See automake bug#8753.
-required="valac GNUmake"
+required="cc valac GNUmake"
. ./defs || Exit 1
cat >> configure.ac << 'END'
@@ -40,14 +40,15 @@ void main ()
}
END
-$ACLOCAL || framework_failure_ "aclocal error"
-$AUTOCONF || framework_failure_ "autoconf error"
-$AUTOMAKE || framework_failure_ "automake error"
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
mkdir build
cd build
../configure || Exit 77
$MAKE
+test -f ../foo_vala.stamp
grep foofoofoo ../hello.c
$MAKE distcheck
@@ -61,6 +62,7 @@ int main ()
END
$MAKE
+test -f ../foo_vala.stamp
grep barbarbar ../hello.c
# Rebuild rules are not uselessly triggered.
diff --git a/t/vala4.sh b/t/vala4.sh
index 2e776ed..067ea3f 100755
--- a/t/vala4.sh
+++ b/t/vala4.sh
@@ -16,12 +16,10 @@
# Test AM_PROG_VALAC.
-required=libtoolize
. ./defs || Exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
-AC_PROG_LIBTOOL
AM_PROG_VALAC([0.0.1])
AC_OUTPUT
END
@@ -42,7 +40,6 @@ cwd=`pwd`
# Use $cwd instead of `pwd` in the && list below to avoid a bug in
# the way Solaris/Heirloom Sh handles 'set -e'.
-libtoolize
$ACLOCAL
$AUTOMAKE -a
$AUTOCONF
--
1.7.9.5
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [FYI] {master} vala tests: few adjustments and improvements,
Stefano Lattarini <=