From 00a29a1b89ae06058931fbc6fd74dc715f422c36 Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Mon, 2 Nov 2009 10:23:33 -0700 Subject: [PATCH] test-update-copyright: update test to match script changes * tests/test-update-copyright.sh: Avoid hard-coding perl location. Don't update *.bak created by earlier runs. Signed-off-by: Eric Blake --- ChangeLog | 6 ++++++ tests/test-update-copyright.sh | 10 +++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 9347ec727..ebbf68fe8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2009-11-02 Eric Blake + + test-update-copyright: update test to match script changes + * tests/test-update-copyright.sh: Avoid hard-coding perl + location. Don't update *.bak created by earlier runs. + 2009-11-02 Paul Eggert Simon Josefsson Bruno Haible diff --git a/tests/test-update-copyright.sh b/tests/test-update-copyright.sh index 24574b29f..859c75d0f 100755 --- a/tests/test-update-copyright.sh +++ b/tests/test-update-copyright.sh @@ -32,7 +32,12 @@ trap 'rm -f $TMP_BASE*' 0 1 2 3 15 TMP=$TMP_BASE s=$TMP-script -printf '#!/usr/bin/perl -pi\ns/a/b/\n' > $s +cat <<\EOF > $s +eval '(exit $?0)' && eval 'exec perl -wS -0777 -pi "$0" ${1+"$@"}' + & eval 'exec perl -wS -0777 -pi "$0" $argv:q' + if 0; +s/a/b/ +EOF chmod a+x $s echo a > $TMP-in ./$s $TMP-in 2>/dev/null && test b = "`cat $TMP-in 2>/dev/null`" || @@ -82,6 +87,7 @@ Copyright (C) 1990-2005, 2007-2009 Acme, Inc. # Foundation, Inc. EOF +rm -f $TMP.*.bak UPDATE_COPYRIGHT_YEAR=2009 \ update-copyright $TMP.* 1> $TMP-stdout 2> $TMP-stderr compare /dev/null $TMP-stdout || exit 1 @@ -124,6 +130,7 @@ Copyright (C) 1990-2005, 2007-2009 Acme, Inc. # Foundation, Inc. EOF +rm -f $TMP.*.bak UPDATE_COPYRIGHT_YEAR=2010 UPDATE_COPYRIGHT_USE_INTERVALS=1 \ update-copyright $TMP.* 1> $TMP-stdout 2> $TMP-stderr compare /dev/null $TMP-stdout || exit 1 @@ -162,6 +169,7 @@ Copyright (C) 1990-2005, 2007-2009 Acme, Inc. # Copyright (C) 1990-2005, 2007-2010 Free Software Foundation, Inc. EOF +rm -f $TMP.*.bak UPDATE_COPYRIGHT_YEAR=2010 UPDATE_COPYRIGHT_FORCE=1 \ update-copyright $TMP.* 1> $TMP-stdout 2> $TMP-stderr compare /dev/null $TMP-stdout || exit 1 -- 2.11.0