tests: fix a timestamp issue, and other minor buglets

Cherry picked from commit v1.11-1988-g82616f0 of 21-02-2012.

Reported by Panther Martin in automake bug#10848.  See also
automake bug#11093.

* tests/conffile-leading-dot.test: Add a proper '$sleep' invocation,
to avoid spurious failures on fast systems without sub-second
timestamp resolutions.  Add other minor related and unrelated
improvements and fixlets since we are at it.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>

diff --git a/THANKS b/THANKS
index e0c44d7b6872c435451a9843fce3b7b44c3768d5..455cc6279d2afef1c8b4a5acb761085012a9a809 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -269,6 +269,7 @@ Olly Betts          olly@muscat.co.uk
 Oren Ben-Kiki          oren@ben-kiki.org
 Owen Taylor            otaylor@redhat.com
 Quentin Glidic         sardemff7+gnu@sardemff7.net
+Panther Martin         mrsmiley98@lycos.com
 Patrick Welche         prlw1@newn.cam.ac.uk
 Patrik Weiskircher     me@justp.at
 Paul Berrevoets                paul@swi.com

diff --git a/tests/conffile-leading-dot.test b/tests/conffile-leading-dot.test
index 1ee153f1fadc1bbcfbb3a907c6a7f6da8802b3f9..8eaed4b8a81b805b3512180192e6e293833e05bc 100755 (executable)
--- a/tests/conffile-leading-dot.test
+++ b/tests/conffile-leading-dot.test
@@ -31,9 +31,7 @@ AC_CONFIG_FILES([./foo:a.in:b.in:c.in])
 AC_OUTPUT
 END
 
-echo foo = barbarbar > Makefile.am
-
-touch a.in b.in c.in
+touch a.in b.in c.in Makefile.am
 
 $ACLOCAL
 
@@ -46,16 +44,19 @@ grep "^configure\.in:4:.* omit leading '\\./'" stderr
 grep "^configure\.in:4:.*remake rules might be subtly broken" stderr
 
 # Check that our warning was actually justified.
+sed 's/^AM_INIT_AUTOMAKE/&([-Wall -Wno-unsupported])/' <configure.in >t
+mv -f t configure.in
+rm -rf autom4te*.cache
+$ACLOCAL
 $AUTOCONF
 $AUTOMAKE -Wall -Wno-unsupported
 ./configure
 $MAKE
-grep barbarbar Makefile
-# No need to sleep here, configure did that for us already.
-echo foo = bazbazbaz > Makefile.am
+$sleep
+touch Makefile.am
 # Check that remake rules do truly break -- otherwise automake is
 # giving a bogus warning.
-$MAKE 2>stderr && { cat stderr >&2 Exit 1; }
+$MAKE 2>stderr && { cat stderr >&2; Exit 1; }
 cat stderr >&2
 grep "config\\.status:.*invalid argument.*Makefile" stderr