[Automake-commit] [SCM] GNU Automake branch, maint, updated. v1.12.2-5-g65e7ac8

[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=65e7ac8c3556d1895ee597811856710143cfc4ac

The branch, maint has been updated
       via  65e7ac8c3556d1895ee597811856710143cfc4ac (commit)
       via  cf80959825ac3b18271d0c15ce7345e64410c2f0 (commit)
      from  1c8bf11bc8db57ef8e33cff04cb6029143b93ac8 (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 65e7ac8c3556d1895ee597811856710143cfc4ac
Author: Stefano Lattarini <address@hidden>
Date:   Tue Jul 10 15:29:57 2012 +0200

    tests: avoid spurious TAP errors on Mac OS X 10.7
    
    Fixes automake bug#1897.  Reported by Max Horn.
    
    * t/suffix8.tap: The libtool bug#11895 was causing the ./configure script
    to output a stray "ok" string on a line of its own, confusing the TAP
    driver into thinking this was an extra test result (which resulted in the
    next, real test results being flagged as "OUT-OF-ORDER").  Fix this by
    protecting configure output.
    * t/suffix10.tap: Likewise, and for the "make distcheck" output as well.
    * THANKS: Update.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit cf80959825ac3b18271d0c15ce7345e64410c2f0
Author: Adam Sampson <address@hidden>
Date:   Tue Jul 10 15:08:15 2012 +0200

    tests: fix spurious failure in aclocal7.sh on fast machines
    
    Fixes automake bug#11896.  Issue introduced in commit v1.12.1-46-g13dd512.
    
    * t/aclocal7.sh: Since aclocal rewrites aclocal.m4 unless the input files
    are all older than the existing aclocal.m4, so we must sleep to ensure
    somedefs.m4 has an older timestamp than the aclocal.m4 the next aclocal
    call will generate.
    
    Copyright-paperwork-exempt: yes
    Signed-off-by: Stefano Lattarini <address@hidden>

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

Summary of changes:
 THANKS         |    1 +
 t/aclocal7.sh  |    5 +++++
 t/suffix10.tap |   13 ++++++++++++-
 t/suffix8.tap  |   15 +++++++++++++--
 4 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/THANKS b/THANKS
index 01b78c1..afdd33a 100644
--- a/THANKS
+++ b/THANKS
@@ -245,6 +245,7 @@ Matthew D. Langston             address@hidden
 Matthias Andree                 address@hidden
 Matthias Clasen                 address@hidden
 Matthias Klose                  address@hidden
+Max Horn                        address@hidden
 Maxim Sinev                     address@hidden
 Maynard Johnson                 address@hidden
 Merijn de Jonge                 address@hidden
diff --git a/t/aclocal7.sh b/t/aclocal7.sh
index 4c03a0c..c050b07 100755
--- a/t/aclocal7.sh
+++ b/t/aclocal7.sh
@@ -45,6 +45,11 @@ AUTOMAKE_after_aclocal ()
   $AUTOMAKE --no-force
 }
 
+# aclocal will rewrite aclocal.m4 unless the input files are all older than the
+# existing aclocal.m4 -- sleep to ensure somedefs.m4 has an older timestamp
+# than the aclocal.m4 that the next aclocal call will generate.
+$sleep
+
 $ACLOCAL -I m4
 AUTOMAKE_after_aclocal
 
diff --git a/t/suffix10.tap b/t/suffix10.tap
index a650924..7e19e04 100755
--- a/t/suffix10.tap
+++ b/t/suffix10.tap
@@ -57,11 +57,22 @@ cat > foo.x_ << 'END'
 int foo (void) { return yyparse(); }
 END
 
+# We must protect the TAP driver from the output of configure, since
+# that might output a stray "ok" on a line of its own (due to a
+# libtool bug on Mac OS X), thus causing a spurious test result to
+# be seen.  See automake bug#11897.
+run_configure ()
+{
+  st=0; ./configure >output 2>&1 || st=1
+  sed 's/^/  /' output
+  test $st -eq 0
+}
+
 command_ok_ "libtoolize" libtoolize --force
 command_ok_ "aclocal"    $ACLOCAL
 command_ok_ "autoconf"   $AUTOCONF
 command_ok_ "automake"   $AUTOMAKE --add-missing
-command_ok_ "configure"  ./configure
+command_ok_ "configure"  run_configure
 command_ok_ "make test"  $MAKE test
 
 directive=''; make_can_chain_suffix_rules || directive=TODO
diff --git a/t/suffix8.tap b/t/suffix8.tap
index fdaf087..516c9b2 100755
--- a/t/suffix8.tap
+++ b/t/suffix8.tap
@@ -75,11 +75,22 @@ END
 echo 'int main (void) { return 0; }' > foo.x_
 echo 'int bar (void) { return 0; }' > bar.x_
 
+# We must protect the TAP driver from the output of configure, since
+# that might output a stray "ok" on a line of its own (due to a
+# libtool bug on Mac OS X), thus causing a spurious test result to
+# be seen.  See automake bug#11897.
+protect_output ()
+{
+  st=0; "$@" >output 2>&1 || st=1
+  sed 's/^/  /' output
+  test $st -eq 0
+}
+
 command_ok_ "libtoolize" libtoolize
 command_ok_ "aclocal"    $ACLOCAL
 command_ok_ "autoconf"   $AUTOCONF
 command_ok_ "automake"   $AUTOMAKE -a
-command_ok_ "configure"  ./configure
+command_ok_ "configure"  protect_output ./configure
 command_ok_ "make test0" env OBJEXT=foo $MAKE -e test0
 command_ok_ "make test1" $MAKE test1
 
@@ -88,7 +99,7 @@ directive=''; make_can_chain_suffix_rules || directive=TODO
 for target in test2 all distcheck; do
   command_ok_ "make $target"  \
               -D "$directive" -r "suffix rules not chained" \
-              $MAKE $target
+              protect_output $MAKE $target
 done
 
 :


hooks/post-receive
-- 
GNU Automake