[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11b-28-g6f12912

[Stefano Lattarini]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=6f12912a2b1c207e8fb3d45d993cc81edc51be47

The branch, master has been updated
       via  6f12912a2b1c207e8fb3d45d993cc81edc51be47 (commit)
      from  e0ce774e6927c4e2121fe92ae47a72a24e470d5e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 6f12912a2b1c207e8fb3d45d993cc81edc51be47
Author: Stefano Lattarini <address@hidden>
Date:   Mon Apr 16 19:18:08 2012 +0200

    vala tests: few adjustments and improvements
    
    * 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>

-----------------------------------------------------------------------

Summary of changes:
 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


hooks/post-receive
-- 
GNU Automake