From 652e59d2790aaf0fedcd8267ac6fe84f10570d46 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Fri, 25 Nov 2011 10:03:49 +0100 Subject: [PATCH] test-update-copyright.sh: avoid false-positive failure * tests/test-update-copyright.sh: Use $TMP.? (not $TMP.*), to work around false positive failure on Cygwin/Windows. The latter was matching erroneously-created files with names like update-copyright.test-ex.4.bak. Reported by Simon Josefsson. --- ChangeLog | 8 ++++++++ tests/test-update-copyright.sh | 6 +++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8dff9d9e1..9623f177a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2011-11-25 Jim Meyering + + test-update-copyright.sh: avoid false-positive failure + * tests/test-update-copyright.sh: Use $TMP.? (not $TMP.*), to work + around false positive failure on Cygwin/Windows. The latter was + matching erroneously-created files with names like + update-copyright.test-ex.4.bak. Reported by Simon Josefsson. + 2011-11-25 Simon Josefsson valgrind-tests.m4: Avoid breakage if valgrind on bash fails. diff --git a/tests/test-update-copyright.sh b/tests/test-update-copyright.sh index a1fce0b57..87054eca5 100755 --- a/tests/test-update-copyright.sh +++ b/tests/test-update-copyright.sh @@ -103,7 +103,7 @@ Copyright (C) 1990-2005, 2007-2009 Acme, Inc. EOF UPDATE_COPYRIGHT_YEAR=2009 \ - update-copyright $TMP.* 1> $TMP-stdout 2> $TMP-stderr + update-copyright $TMP.? 1> $TMP-stdout 2> $TMP-stderr compare /dev/null $TMP-stdout || exit 1 compare - $TMP-stderr < $TMP-stdout 2> $TMP-stderr + update-copyright $TMP.? 1> $TMP-stdout 2> $TMP-stderr compare /dev/null $TMP-stdout || exit 1 compare - $TMP-stderr < $TMP-stdout 2> $TMP-stderr + update-copyright $TMP.? 1> $TMP-stdout 2> $TMP-stderr compare /dev/null $TMP-stdout || exit 1 compare - $TMP-stderr <