From 625678d54b616bf5c2db6c803f4b0746f70e3e53 Mon Sep 17 00:00:00 2001 From: Peter Rosin Date: Wed, 29 May 2013 16:53:55 +0200 Subject: tests: avoid a spurious failure on MSYS Fixes automake bug#14493. * t/cxx-demo.sh: Strip CR characters from the program output. Signed-off-by: Peter Rosin --- t/cxx-demo.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 -- cgit v1.2.1 From eb33ae2b29f33bcf65afc036c9a92a61f77f75e3 Mon Sep 17 00:00:00 2001 From: Peter Rosin Date: Wed, 29 May 2013 17:10:40 +0200 Subject: tests: prune some weed in a non-POSIX test Fixes automake bug#14494. * t/distcheck-pr10470.sh: Make sure the test-driver is installed. Adjust to run_make changes. Adjust grep pattern to match new output. Signed-off-by: Peter Rosin Co-authored-by: Stefano Lattarini --- t/distcheck-pr10470.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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" : -- cgit v1.2.1 From b4bfacb65624e070a25ad0d77f1353308ddccdf2 Mon Sep 17 00:00:00 2001 From: Peter Rosin Date: Thu, 30 May 2013 10:49:42 +0200 Subject: depcomp: avoid trailing backslash in depfile for depmode=msvc7 When compiling a file without any dependencies (no #includes), the msvc7 depmode (and consequently msvc7msys) generates a depfile Makefile fragment with the last line ending with a backslash. This is less robust than needed. Fixes automake bug#14501. * lib/depcomp (msvc7): Finish off the depfile Makefile fragment with an empty line. (scriptversion): Update. Signed-off-by: Peter Rosin --- lib/depcomp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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" ;; -- cgit v1.2.1 From d3b8ad219907393ac062537fd9f42609c3d6538a Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Thu, 30 May 2013 11:28:02 +0200 Subject: NEWS: document recent testsuite fixes (MinGW/MSYS related) Signed-off-by: Stefano Lattarini --- NEWS | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 39f5121b0..546d78ccd 100644 --- a/NEWS +++ b/NEWS @@ -132,7 +132,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. ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -- cgit v1.2.1