From 1a48af730c9cc5b019104b03861a2f597d3b76e3 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering@redhat.com> Date: Mon, 3 Jan 2011 08:54:13 +0100 Subject: [PATCH] update-copyright: adjust test to match changed code * tests/test-update-copyright.sh: Change test's expected output to match new actual output. --- ChangeLog | 6 ++++++ tests/test-update-copyright.sh | 16 ++++++++-------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 88554fc149..6577d3e207 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2011-01-03 Jim Meyering <meyering@redhat.com> + + update-copyright: adjust test to match changed code + * tests/test-update-copyright.sh: Change test's expected output + to match new actual output. + 2011-01-02 Bruno Haible <bruno@clisp.org> getlogin_r: Avoid test failure on HP-UX 11. diff --git a/tests/test-update-copyright.sh b/tests/test-update-copyright.sh index 60f7cc118a..83275ade25 100755 --- a/tests/test-update-copyright.sh +++ b/tests/test-update-copyright.sh @@ -107,8 +107,8 @@ UPDATE_COPYRIGHT_YEAR=2009 \ update-copyright $TMP.* 1> $TMP-stdout 2> $TMP-stderr compare /dev/null $TMP-stdout || exit 1 compare - $TMP-stderr <<EOF || exit 1 -$TMP.4: warning: FSF copyright statement not found -$TMP.5: warning: FSF copyright statement not found +$TMP.4: warning: copyright statement not found +$TMP.5: warning: copyright statement not found EOF compare - $TMP.1 <<EOF || exit 1 Copyright @copyright{} 1990-2005, 2007-2009 Free Software @@ -150,8 +150,8 @@ 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 compare - $TMP-stderr <<EOF || exit 1 -$TMP.4: warning: FSF copyright statement not found -$TMP.5: warning: FSF copyright statement not found +$TMP.4: warning: copyright statement not found +$TMP.5: warning: copyright statement not found EOF compare - $TMP.1 <<EOF || exit 1 Copyright @copyright{} 1990-2005, 2007-2010 Free Software Foundation, @@ -189,8 +189,8 @@ UPDATE_COPYRIGHT_YEAR=2010 UPDATE_COPYRIGHT_FORCE=1 \ update-copyright $TMP.* 1> $TMP-stdout 2> $TMP-stderr compare /dev/null $TMP-stdout || exit 1 compare - $TMP-stderr <<EOF || exit 1 -$TMP.4: warning: FSF copyright statement not found -$TMP.5: warning: FSF copyright statement not found +$TMP.4: warning: copyright statement not found +$TMP.5: warning: copyright statement not found EOF compare - $TMP.1 <<EOF || exit 1 Copyright @copyright{} 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, @@ -326,7 +326,7 @@ UPDATE_COPYRIGHT_YEAR=2010 \ update-copyright $TMP 1> $TMP-stdout 2> $TMP-stderr compare /dev/null $TMP-stdout || exit 1 compare - $TMP-stderr <<EOF || exit 1 -$TMP: warning: FSF copyright statement not found +$TMP: warning: copyright statement not found EOF compare - $TMP <<EOF || exit 1 #### Copyright (C) 1976, 1977, 1978, 1979, 1980, 1981, 1982, 1983, 1984, 1985, @@ -355,7 +355,7 @@ UPDATE_COPYRIGHT_YEAR=2010 \ update-copyright $TMP 1> $TMP-stdout 2> $TMP-stderr compare /dev/null $TMP-stdout || exit 1 compare - $TMP-stderr <<EOF || exit 1 -$TMP: warning: FSF copyright statement not found +$TMP: warning: copyright statement not found EOF compare - $TMP <<EOF || exit 1 #Copyright (C) 1976, 1977, 1978, 1979, 1980, 1981, 1982, 1983, 1984, 1985, -- 2.30.2