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

4 files changed, 12 insertions, 6 deletions

diff --git a/NEWS b/NEWS
index aba7a265e..9a69a2525 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 06b0882dd..4ebd5b3a2 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 f6d568d78..f872c43e2 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 f6cb1601e..a2781dfa2 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"
 
 :