[Automake-commit] [SCM] GNU Automake branch, maint, updated. v1.13.2-235-g0d9399f

[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=0d9399f1efe69864f3295ada6325b14d953149c2

The branch, maint has been updated
       via  0d9399f1efe69864f3295ada6325b14d953149c2 (commit)
       via  d3b8ad219907393ac062537fd9f42609c3d6538a (commit)
       via  b4bfacb65624e070a25ad0d77f1353308ddccdf2 (commit)
       via  eb33ae2b29f33bcf65afc036c9a92a61f77f75e3 (commit)
       via  625678d54b616bf5c2db6c803f4b0746f70e3e53 (commit)
      from  9f325eea27e41d868fbe020fe4034bec3c758fb0 (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 0d9399f1efe69864f3295ada6325b14d953149c2
Merge: 9f325ee d3b8ad2
Author: Stefano Lattarini <address@hidden>
Date:   Thu May 30 11:55:48 2013 +0200

    Merge branch 'micro' into maint
    
    * micro:
      NEWS: document recent testsuite fixes (MinGW/MSYS related)
      depcomp: avoid trailing backslash in depfile for depmode=msvc7
      tests: prune some weed in a non-POSIX test
      tests: avoid a spurious failure on MSYS

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

Summary of changes:
 NEWS                   |    6 +++++-
 lib/depcomp            |    3 ++-
 t/cxx-demo.sh          |    3 ++-
 t/distcheck-pr10470.sh |    6 +++---
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/NEWS b/NEWS
index aba7a26..9a69a25 100644
--- a/NEWS
+++ b/NEWS
@@ -254,7 +254,11 @@ New in 1.13.3:
          (see automake bug#11413 for a description of the subtle issues in
          this area).
 
-   - Some other minor, miscellaneous changes and fixlets.
+  - Few spurious failures have been fixed (they hit especially MinGW/MSYS).
+    See automake bugs #14493, #14494, #14495, #14498, #14499, #14500 and
+    #14501.
+
+  - Some other minor miscellaneous changes and fixlets.
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
diff --git a/lib/depcomp b/lib/depcomp
index 06b0882..4ebd5b3 100755
--- a/lib/depcomp
+++ b/lib/depcomp
@@ -1,7 +1,7 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
-scriptversion=2012-10-18.11; # UTC
+scriptversion=2013-05-30.07; # UTC
 
 # Copyright (C) 1999-2013 Free Software Foundation, Inc.
 
@@ -552,6 +552,7 @@ $ {
   G
   p
 }' >> "$depfile"
+  echo >> "$depfile" # make sure the fragment doesn't end with a backslash
   rm -f "$tmpdepfile"
   ;;
 
diff --git a/t/cxx-demo.sh b/t/cxx-demo.sh
index f6d568d..f872c43 100644
--- a/t/cxx-demo.sh
+++ b/t/cxx-demo.sh
@@ -165,7 +165,8 @@ END
     Good morning, work.
 END
   for p in play work; do
-    ./$p > got.$p || { cat got.$p; exit 1; }
+    # Strip CR characters catering to MinGW programs on MSYS.
+    ./$p | tr -d '\015' > got.$p || { cat got.$p; exit 1; }
     cat exp.$p
     cat got.$p
     diff exp.$p got.$p
diff --git a/t/distcheck-pr10470.sh b/t/distcheck-pr10470.sh
index f6cb160..a2781df 100644
--- a/t/distcheck-pr10470.sh
+++ b/t/distcheck-pr10470.sh
@@ -45,13 +45,13 @@ chmod a+x foo.test
 
 $ACLOCAL
 $AUTOCONF
-$AUTOMAKE
+$AUTOMAKE -a
 ./configure
 
 # We can build the distribution.
-run_make -M -e FAIL distcheck
+run_make -M distcheck
 # Sanity check: verify that our code has hit a problem removing
 # the distdir, but has recovered from it.
-grep "rm:.*$destdir" output || fatal_ "expected code path not covered"
+$EGREP "(^| )(rm|find):.*$distdir" output || fatal_ "expected code path not 
covered"
 
 :


hooks/post-receive
-- 
GNU Automake