Re: Copyright year update

Mon, 01 Jan 2024 16:58:49 -0800 

On 2024-01-01 16:08, Bernhard Voelker wrote:

That commit broke the 'update-copyright' tests, because the test script
got messed up.



Thanks for reporting that. Turing would have been amused by 
update-copyright modifying its own test, and then failing the modified 
test. I installed the attached to immunize the test against the program 
it tests.
From d57daa5979535178a57789403506270b6311cc85 Mon Sep 17 00:00:00 2001
From: Paul Eggert <egg...@cs.ucla.edu>
Date: Mon, 1 Jan 2024 16:51:51 -0800
Subject: [PATCH] update-copyright-tests: immunize against self

Problem reported by Bernhard Voelker in:
https://lists.gnu.org/r/bug-gnulib/2024-01/msg00003.html
* tests/test-update-copyright.sh (ight): New var.
Use it in tests, to prevent update-copyright from
messing with the test data.
---
 ChangeLog                      |   9 ++
 tests/test-update-copyright.sh | 187 ++++++++++++++++++---------------
 2 files changed, 109 insertions(+), 87 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index af3cf23a6c..fc728584f7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2024-01-01  Paul Eggert  <egg...@cs.ucla.edu>
+
+	update-copyright-tests: immunize against self
+	Problem reported by Bernhard Voelker in:
+	https://lists.gnu.org/r/bug-gnulib/2024-01/msg00003.html
+	* tests/test-update-copyright.sh (ight): New var.
+	Use it in tests, to prevent update-copyright from
+	messing with the test data.
+
 2023-12-29  Paul Eggert  <egg...@cs.ucla.edu>
 
 	tests: don’t skip if LONG_MAX < pid
diff --git a/tests/test-update-copyright.sh b/tests/test-update-copyright.sh
index ff7a6b2770..a465617527 100755
--- a/tests/test-update-copyright.sh
+++ b/tests/test-update-copyright.sh
@@ -76,46 +76,53 @@ perl -e 'require 5.8.0' || {
 UPDATE_COPYRIGHT_MAX_LINE_LENGTH=72
 export UPDATE_COPYRIGHT_MAX_LINE_LENGTH
 
+# This assignment to 'ight' is is so that data can contain strings
+# like "Copy$ight 2024 Free Software Foundation, Inc." without being
+# mistakenly updated by "cd .. && make update-copyright".
+ight=right
+
 ## ----------------------------- ##
 ## Examples from documentation.  ##
 ## ----------------------------- ##
 
 TMP=$TMP_BASE-ex
 cat > $TMP-1 <<EOF
-Copyright @copyright{} 1990-2005, 2007-2009 Free Software
+Copy$ight @copy$ight{} 1990-2005, 2007-2009 Free Software
 Foundation, Inc.
 EOF
 cat > $TMP-2 <<EOF
-# Copyright (C) 2009-2024 Free Software Foundation, Inc.
+# Copy$ight (C) 1990-2005, 2007-2009 Free Software
+# Foundation, Inc.
 EOF
 cat > $TMP-3 <<EOF
 /*
- * Copyright &copy; 90,2005,2007-2009
+ * Copy$ight &copy; 90,2005,2007-2009
  * Free Software Foundation, Inc.
  */
 EOF
 cat > $TMP-4 <<EOF
-## Copyright (C) 1990-2005, 2007-2009 Free Software
+## Copy$ight (C) 1990-2005, 2007-2009 Free Software
 #  Foundation, Inc.
 EOF
 cat > $TMP-5 <<EOF
-Copyright (C) 1990-2005, 2007-2009 Acme, Inc.
+Copy$ight (C) 1990-2005, 2007-2009 Acme, Inc.
 EOF
 cat > $TMP-6 <<EOF
-## Copyright (C) 1990-2005, 2007-2009 Free Software
+## Copy$ight (C) 1990-2005, 2007-2009 Free Software
 #  Foundation, Inc.
 
-Copyright (C) 1990-2005, 2007-2009 Free Software Foundation,
+Copy$ight (C) 1990-2005, 2007-2009 Free Software Foundation,
 Inc.
 EOF
 cat > $TMP-7 <<EOF
-Copyright (C) 1990-2005, 2007-2009 Acme, Inc.
+Copy$ight (C) 1990-2005, 2007-2009 Acme, Inc.
 
-# Copyright (C) 2009-2024 Free Software Foundation, Inc.
+# Copy$ight (C) 1990-2005, 2007-2009 Free Software
+# Foundation, Inc.
 EOF
 cat > $TMP-8 <<EOF
-Copyright (C) 2008 Free Software Foundation, Inc.
-Copyright (C) 2008 Free Software Foundation, Inc.
+Copy$ight (C) 2008 Free Software Foundation, Inc.
+Copy$ight (C) 2008 Free Software Foundation, Inc.
 EOF
 
 UPDATE_COPYRIGHT_YEAR=2009 \
@@ -126,40 +133,42 @@ $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
+Copy$ight @copy$ight{} 1990-2005, 2007-2009 Free Software
 Foundation, Inc.
 EOF
 compare - $TMP-2 <<EOF || exit 1
-# Copyright (C) 2009-2024 Free Software Foundation, Inc.
+# Copy$ight (C) 1990-2005, 2007-2009 Free Software
+# Foundation, Inc.
 EOF
 compare - $TMP-3 <<EOF || exit 1
 /*
- * Copyright &copy; 90,2005,2007-2009
+ * Copy$ight &copy; 90,2005,2007-2009
  * Free Software Foundation, Inc.
  */
 EOF
 compare - $TMP-4 <<EOF || exit 1
-## Copyright (C) 1990-2005, 2007-2009 Free Software
+## Copy$ight (C) 1990-2005, 2007-2009 Free Software
 #  Foundation, Inc.
 EOF
 compare - $TMP-5 <<EOF || exit 1
-Copyright (C) 1990-2005, 2007-2009 Acme, Inc.
+Copy$ight (C) 1990-2005, 2007-2009 Acme, Inc.
 EOF
 compare - $TMP-6 <<EOF || exit 1
-## Copyright (C) 1990-2005, 2007-2009 Free Software
+## Copy$ight (C) 1990-2005, 2007-2009 Free Software
 #  Foundation, Inc.
 
-Copyright (C) 1990-2005, 2007-2009 Free Software Foundation,
+Copy$ight (C) 1990-2005, 2007-2009 Free Software Foundation,
 Inc.
 EOF
 compare - $TMP-7 <<EOF || exit 1
-Copyright (C) 1990-2005, 2007-2009 Acme, Inc.
+Copy$ight (C) 1990-2005, 2007-2009 Acme, Inc.
 
-# Copyright (C) 2009-2024 Free Software Foundation, Inc.
+# Copy$ight (C) 1990-2005, 2007-2009 Free Software
+# Foundation, Inc.
 EOF
 compare - $TMP-8 <<EOF || exit 1
-Copyright (C) 2008, 2009 Free Software Foundation, Inc.
-Copyright (C) 2008, 2009 Free Software Foundation, Inc.
+Copy$ight (C) 2008, 2009 Free Software Foundation, Inc.
+Copy$ight (C) 2008, 2009 Free Software Foundation, Inc.
 EOF
 
 UPDATE_COPYRIGHT_YEAR=2010 UPDATE_COPYRIGHT_USE_INTERVALS=1 \
@@ -170,34 +179,34 @@ $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,
+Copy$ight @copy$ight{} 1990-2005, 2007-2010 Free Software Foundation,
 Inc.
 EOF
 compare - $TMP-2 <<EOF || exit 1
-# Copyright (C) 2009-2024 Free Software Foundation, Inc.
+# Copy$ight (C) 1990-2005, 2007-2010 Free Software Foundation, Inc.
 EOF
 compare - $TMP-3 <<EOF || exit 1
 /*
- * Copyright &copy; 1990, 2005, 2007-2010 Free Software Foundation, Inc.
+ * Copy$ight &copy; 1990, 2005, 2007-2010 Free Software Foundation, Inc.
  */
 EOF
 compare - $TMP-4 <<EOF || exit 1
-## Copyright (C) 1990-2005, 2007-2009 Free Software
+## Copy$ight (C) 1990-2005, 2007-2009 Free Software
 #  Foundation, Inc.
 EOF
 compare - $TMP-5 <<EOF || exit 1
-Copyright (C) 1990-2005, 2007-2009 Acme, Inc.
+Copy$ight (C) 1990-2005, 2007-2009 Acme, Inc.
 EOF
 compare - $TMP-6 <<EOF || exit 1
-## Copyright (C) 1990-2005, 2007-2009 Free Software
+## Copy$ight (C) 1990-2005, 2007-2009 Free Software
 #  Foundation, Inc.
 
-Copyright (C) 1990-2005, 2007-2010 Free Software Foundation, Inc.
+Copy$ight (C) 1990-2005, 2007-2010 Free Software Foundation, Inc.
 EOF
 compare - $TMP-7 <<EOF || exit 1
-Copyright (C) 1990-2005, 2007-2009 Acme, Inc.
+Copy$ight (C) 1990-2005, 2007-2009 Acme, Inc.
 
-# Copyright (C) 2009-2024 Free Software Foundation, Inc.
+# Copy$ight (C) 1990-2005, 2007-2010 Free Software Foundation, Inc.
 EOF
 
 UPDATE_COPYRIGHT_YEAR=2010 UPDATE_COPYRIGHT_FORCE=1 \
@@ -208,38 +217,42 @@ $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,
+Copy$ight @copy$ight{} 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997,
 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2008, 2009, 2010
 Free Software Foundation, Inc.
 EOF
 compare - $TMP-2 <<EOF || exit 1
-# Copyright (C) 2009-2024 Free Software Foundation, Inc.
+# Copy$ight (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
+# 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2008, 2009, 2010 Free
+# Software Foundation, Inc.
 EOF
 compare - $TMP-3 <<EOF || exit 1
 /*
- * Copyright &copy; 1990, 2005, 2007, 2008, 2009, 2010 Free Software
+ * Copy$ight &copy; 1990, 2005, 2007, 2008, 2009, 2010 Free Software
  * Foundation, Inc.
  */
 EOF
 compare - $TMP-4 <<EOF || exit 1
-## Copyright (C) 1990-2005, 2007-2009 Free Software
+## Copy$ight (C) 1990-2005, 2007-2009 Free Software
 #  Foundation, Inc.
 EOF
 compare - $TMP-5 <<EOF || exit 1
-Copyright (C) 1990-2005, 2007-2009 Acme, Inc.
+Copy$ight (C) 1990-2005, 2007-2009 Acme, Inc.
 EOF
 compare - $TMP-6 <<EOF || exit 1
-## Copyright (C) 1990-2005, 2007-2009 Free Software
+## Copy$ight (C) 1990-2005, 2007-2009 Free Software
 #  Foundation, Inc.
 
-Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
+Copy$ight (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2008, 2009, 2010 Free
 Software Foundation, Inc.
 EOF
 compare - $TMP-7 <<EOF || exit 1
-Copyright (C) 1990-2005, 2007-2009 Acme, Inc.
+Copy$ight (C) 1990-2005, 2007-2009 Acme, Inc.
 
-# Copyright (C) 2009-2024 Free Software Foundation, Inc.
+# Copy$ight (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
+# 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2008, 2009, 2010 Free
+# Software Foundation, Inc.
 EOF
 
 rm $TMP*
@@ -250,16 +263,16 @@ rm $TMP*
 
 TMP=$TMP_BASE-man
 cat > $TMP.1 <<EOF
-'\" Copyright (C) 1998-2009 Free Software Foundation, Inc.
+'\" Copy$ight (C) 1998-2009 Free Software Foundation, Inc.
 EOF
 cat > $TMP.2 <<EOF
-Copyright \(co 1998-2009 Free Software Foundation, Inc.
+Copy$ight \(co 1998-2009 Free Software Foundation, Inc.
 EOF
 cat > $TMP.3 <<EOF
-Copyright \(co 1998\(en2009 Free Software Foundation, Inc.
+Copy$ight \(co 1998\(en2009 Free Software Foundation, Inc.
 EOF
 cat > $TMP.4 <<EOF
-Copyright \(co 2009 Free Software Foundation, Inc.
+Copy$ight \(co 2009 Free Software Foundation, Inc.
 EOF
 
 UPDATE_COPYRIGHT_YEAR=2010 UPDATE_COPYRIGHT_USE_INTERVALS=1 \
@@ -267,16 +280,16 @@ UPDATE_COPYRIGHT_YEAR=2010 UPDATE_COPYRIGHT_USE_INTERVALS=1 \
 compare /dev/null $TMP-stdout || exit 1
 compare /dev/null $TMP-stderr || exit 1
 compare - $TMP.1 <<EOF || exit 1
-'\" Copyright (C) 1998\(en2010 Free Software Foundation, Inc.
+'\" Copy$ight (C) 1998\(en2010 Free Software Foundation, Inc.
 EOF
 compare - $TMP.2 <<EOF || exit 1
-Copyright \(co 1998\(en2010 Free Software Foundation, Inc.
+Copy$ight \(co 1998\(en2010 Free Software Foundation, Inc.
 EOF
 compare - $TMP.3 <<EOF || exit 1
-Copyright \(co 1998\(en2010 Free Software Foundation, Inc.
+Copy$ight \(co 1998\(en2010 Free Software Foundation, Inc.
 EOF
 compare - $TMP.4 <<EOF || exit 1
-Copyright \(co 2009\(en2010 Free Software Foundation, Inc.
+Copy$ight \(co 2009\(en2010 Free Software Foundation, Inc.
 EOF
 
 rm $TMP*
@@ -288,7 +301,7 @@ rm $TMP*
 TMP=$TMP_BASE-current-year
 YEAR=`date +%Y`
 cat > $TMP <<EOF
-'\" Copyright (C) 2006
+'\" Copy$ight (C) 2006
 '\" Free Software Foundation,
 '\" Inc.
 EOF
@@ -303,7 +316,7 @@ UPDATE_COPYRIGHT_USE_INTERVALS=1 \
 compare /dev/null $TMP-stdout || exit 1
 compare /dev/null $TMP-stderr || exit 1
 compare - $TMP <<EOF || exit 1
-'\" Copyright (C) 2006, $YEAR Free Software Foundation, Inc.
+'\" Copy$ight (C) 2006, $YEAR Free Software Foundation, Inc.
 EOF
 rm $TMP*
 
@@ -315,7 +328,7 @@ TMP=$TMP_BASE-surrounding-text
 cat > $TMP <<EOF
     Undisturbed text.
 dnl Undisturbed text.
-dnl Copyright (C) 89
+dnl Copy$ight (C) 89
 dnl Free Software Foundation, Inc.
 dnl   Undisturbed text.
 EOF
@@ -326,7 +339,7 @@ compare /dev/null $TMP-stderr || exit 1
 compare - $TMP <<EOF || exit 1
     Undisturbed text.
 dnl Undisturbed text.
-dnl Copyright (C) 1989, 2010 Free Software Foundation, Inc.
+dnl Copy$ight (C) 1989, 2010 Free Software Foundation, Inc.
 dnl   Undisturbed text.
 EOF
 rm $TMP*
@@ -337,7 +350,7 @@ rm $TMP*
 
 TMP=$TMP_BASE-widest-prefix
 cat > $TMP <<EOF
-#### Copyright (C) 1976, 1977, 1978, 1979, 1980, 1981, 1982, 1983, 1984, 1985,
+#### Copy$ight (C) 1976, 1977, 1978, 1979, 1980, 1981, 1982, 1983, 1984, 1985,
 #### 1986, 1987, 1988, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
 #### 2008 Free Software Foundation, Inc.
 EOF
@@ -346,7 +359,7 @@ UPDATE_COPYRIGHT_YEAR=2010 \
 compare /dev/null $TMP-stdout || exit 1
 compare /dev/null $TMP-stderr || exit 1
 compare - $TMP <<EOF || exit 1
-#### Copyright (C) 1976, 1977, 1978, 1979, 1980, 1981, 1982, 1983, 1984,
+#### Copy$ight (C) 1976, 1977, 1978, 1979, 1980, 1981, 1982, 1983, 1984,
 #### 1985, 1986, 1987, 1988, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
 #### 2006, 2007, 2008, 2010 Free Software Foundation, Inc.
 EOF
@@ -355,7 +368,7 @@ UPDATE_COPYRIGHT_YEAR=2011 UPDATE_COPYRIGHT_USE_INTERVALS=1 \
 compare /dev/null $TMP-stdout || exit 1
 compare /dev/null $TMP-stderr || exit 1
 compare - $TMP <<EOF || exit 1
-#### Copyright (C) 1976-1988, 1999-2008, 2010-2011 Free Software
+#### Copy$ight (C) 1976-1988, 1999-2008, 2010-2011 Free Software
 #### Foundation, Inc.
 EOF
 rm $TMP*
@@ -377,7 +390,7 @@ compare - $TMP-stderr <<EOF || exit 1
 $TMP: warning: copyright statement not found
 EOF
 compare - $TMP <<EOF || exit 1
-####  Copyright (C) 1976, 1977, 1978, 1979, 1980, 1981, 1982, 1983, 1984, 1985,
+####  Copy$ight (C) 1976, 1977, 1978, 1979, 1980, 1981, 1982, 1983, 1984, 1985,
 ####  1986, 1987, 1988, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
 ####  2008 Free Software Foundation, Inc.
 EOF
@@ -389,12 +402,12 @@ rm $TMP*
 
 TMP=$TMP_BASE-blank-lines
 cat > $TMP <<EOF
-#Copyright (C) 1976, 1977, 1978, 1979, 1980, 1981, 1982, 1983, 1984, 1985,
+#Copy$ight (C) 1976, 1977, 1978, 1979, 1980, 1981, 1982, 1983, 1984, 1985,
 #
 #1986, 1987, 1988, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
 #2008 Free Software Foundation, Inc.
 
-Copyright (C) 1976, 1977, 1978, 1979, 1980, 1981, 1982, 1983, 1984, 1985,
+Copy$ight (C) 1976, 1977, 1978, 1979, 1980, 1981, 1982, 1983, 1984, 1985,
 
 1986, 1987, 1988, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
 2008 Free Software Foundation, Inc.
@@ -406,12 +419,12 @@ compare - $TMP-stderr <<EOF || exit 1
 $TMP: warning: copyright statement not found
 EOF
 compare - $TMP <<EOF || exit 1
-#Copyright (C) 1976, 1977, 1978, 1979, 1980, 1981, 1982, 1983, 1984, 1985,
+#Copy$ight (C) 1976, 1977, 1978, 1979, 1980, 1981, 1982, 1983, 1984, 1985,
 #
 #1986, 1987, 1988, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
 #2008 Free Software Foundation, Inc.
 
-Copyright (C) 1976, 1977, 1978, 1979, 1980, 1981, 1982, 1983, 1984, 1985,
+Copy$ight (C) 1976, 1977, 1978, 1979, 1980, 1981, 1982, 1983, 1984, 1985,
 
 1986, 1987, 1988, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
 2008 Free Software Foundation, Inc.
@@ -424,7 +437,7 @@ rm $TMP*
 
 TMP=$TMP_BASE-leading-tabs
 cat > $TMP <<EOF
-	Copyright (C) 87, 88, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 98,
+	Copy$ight (C) 87, 88, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 98,
 	 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free
 	Software Foundation, Inc.
 EOF
@@ -433,7 +446,7 @@ UPDATE_COPYRIGHT_YEAR=2010 \
 compare /dev/null $TMP-stdout || exit 1
 compare /dev/null $TMP-stderr || exit 1
 compare - $TMP <<EOF || exit 1
-	Copyright (C) 1987, 1988, 1991, 1992, 1993, 1994, 1995, 1996,
+	Copy$ight (C) 1987, 1988, 1991, 1992, 1993, 1994, 1995, 1996,
 	1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
 	2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 EOF
@@ -442,7 +455,7 @@ UPDATE_COPYRIGHT_YEAR=2011 UPDATE_COPYRIGHT_USE_INTERVALS=1 \
 compare /dev/null $TMP-stdout || exit 1
 compare /dev/null $TMP-stderr || exit 1
 compare - $TMP <<EOF || exit 1
-	Copyright (C) 1987-1988, 1991-2011 Free Software Foundation,
+	Copy$ight (C) 1987-1988, 1991-2011 Free Software Foundation,
 	Inc.
 EOF
 rm $TMP*
@@ -453,7 +466,7 @@ rm $TMP*
 
 TMP=$TMP_BASE-unusual-ws
 cat > $TMP <<EOF
-		# Copyright (C) 87-88, 1991, 1992, 1993, 1994, 1995, 1996, 1997,
+		# Copy$ight (C) 87-88, 1991, 1992, 1993, 1994, 1995, 1996, 1997,
 		# 98, 1999, 2000, 2001, 2002, 2003,     		  2004, 2005, 2006, 2007, 2008,
 		# 2009 Free Software Foundation, Inc.
 EOF
@@ -462,7 +475,7 @@ UPDATE_COPYRIGHT_YEAR=2010 \
 compare /dev/null $TMP-stdout || exit 1
 compare /dev/null $TMP-stderr || exit 1
 compare - $TMP <<EOF || exit 1
-		# Copyright (C) 1987, 1988, 1991, 1992, 1993, 1994,
+		# Copy$ight (C) 1987, 1988, 1991, 1992, 1993, 1994,
 		# 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
 		# 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
 		# Foundation, Inc.
@@ -472,7 +485,7 @@ UPDATE_COPYRIGHT_YEAR=2011 UPDATE_COPYRIGHT_USE_INTERVALS=1 \
 compare /dev/null $TMP-stdout || exit 1
 compare /dev/null $TMP-stderr || exit 1
 compare - $TMP <<EOF || exit 1
-		# Copyright (C) 1987-1988, 1991-2011 Free Software
+		# Copy$ight (C) 1987-1988, 1991-2011 Free Software
 		# Foundation, Inc.
 EOF
 UPDATE_COPYRIGHT_YEAR=2011 UPDATE_COPYRIGHT_USE_INTERVALS=2 \
@@ -480,7 +493,7 @@ UPDATE_COPYRIGHT_YEAR=2011 UPDATE_COPYRIGHT_USE_INTERVALS=2 \
 compare /dev/null $TMP-stdout || exit 1
 compare /dev/null $TMP-stderr || exit 1
 compare - $TMP <<EOF || exit 1
-		# Copyright (C) 1987-2011 Free Software Foundation, Inc.
+		# Copy$ight (C) 1987-2011 Free Software Foundation, Inc.
 EOF
 rm $TMP*
 
@@ -489,8 +502,8 @@ rm $TMP*
 ## --------- ##
 
 TMP=$TMP_BASE-dos-eol
-tr @ '\015' > $TMP <<\EOF
-Rem Copyright (C) 87, 88, 1991, 1992, 1993, 1994, 1995, 1996, 1997,@
+tr @ '\015' > $TMP <<EOF
+Rem Copy$ight (C) 87, 88, 1991, 1992, 1993, 1994, 1995, 1996, 1997,@
 Rem 98, 1999, 2000, 2001, 2002, 2003,  2004, 2005, 2006, 2007, 2008,@
 Rem 2009 Free Software Foundation, Inc.@
 EOF
@@ -498,8 +511,8 @@ UPDATE_COPYRIGHT_YEAR=2010 \
   update-copyright $TMP 1> $TMP-stdout 2> $TMP-stderr
 compare /dev/null $TMP-stdout || exit 1
 compare /dev/null $TMP-stderr || exit 1
-tr @ '\015' > $TMP-exp <<\EOF
-Rem Copyright (C) 1987, 1988, 1991, 1992, 1993, 1994, 1995, 1996, 1997,@
+tr @ '\015' > $TMP-exp <<EOF
+Rem Copy$ight (C) 1987, 1988, 1991, 1992, 1993, 1994, 1995, 1996, 1997,@
 Rem 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,@
 Rem 2009, 2010 Free Software Foundation, Inc.@
 EOF
@@ -512,7 +525,7 @@ rm $TMP*
 
 TMP=$TMP_BASE-omitted-circle-c
 cat > $TMP <<EOF
-  Copyright 87, 88, 1991, 1992, 1993, 1994, 1995, 1996, 1997,
+  Copy$ight 87, 88, 1991, 1992, 1993, 1994, 1995, 1996, 1997,
   98, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
   2009 Free Software Foundation, Inc.
 EOF
@@ -521,7 +534,7 @@ UPDATE_COPYRIGHT_YEAR=2010 \
 compare /dev/null $TMP-stdout || exit 1
 compare /dev/null $TMP-stderr || exit 1
 compare - $TMP <<EOF || exit 1
-  Copyright 1987, 1988, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
+  Copy$ight 1987, 1988, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
   1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
   Free Software Foundation, Inc.
 EOF
@@ -533,65 +546,65 @@ rm $TMP*
 
 TMP=$TMP_BASE-c-style-comments
 cat > $TMP.star <<EOF
-/*  Copyright 87, 88, 1991, 1992, 1993, 1994, 1995, 1996, 1997,
+/*  Copy$ight 87, 88, 1991, 1992, 1993, 1994, 1995, 1996, 1997,
  *  98, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
  *  2009 Free Software Foundation, Inc.  */
 EOF
 cat > $TMP.space <<EOF
-  /*Copyright 87, 88, 1991, 1992, 1993, 1994, 1995, 1996, 1997,
+  /*Copy$ight 87, 88, 1991, 1992, 1993, 1994, 1995, 1996, 1997,
     98, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
     2009 Free Software Foundation, Inc.  */
 EOF
 cat > $TMP.single-line <<EOF
-/*   Copyright 87, 1991, 1992 Free Software Foundation, Inc.  */
+/*   Copy$ight 87, 1991, 1992 Free Software Foundation, Inc.  */
 EOF
 cat > $TMP.single-line-wrapped <<EOF
- /* Copyright 1988, 1991, 1992, 1993 Free Software Foundation, Inc.  */
+ /* Copy$ight 1988, 1991, 1992, 1993 Free Software Foundation, Inc.  */
 EOF
 cat > $TMP.extra-text-star <<EOF
- /* Copyright 1987, 1988, 1991, 1992 Free Software Foundation, Inc.  End
+ /* Copy$ight 1987, 1988, 1991, 1992 Free Software Foundation, Inc.  End
   * More comments.  */
 EOF
 cat > $TMP.extra-text-space <<EOF
- /* Copyright 1987, 1988, 1991, 1992 Free Software Foundation, Inc. ***
+ /* Copy$ight 1987, 1988, 1991, 1992 Free Software Foundation, Inc. ***
     * End of comments. */
 EOF
 cat > $TMP.two-digit-final-is-substr-of-first <<EOF
- /* Copyright 1991, 99 Free Software Foundation, Inc. */
+ /* Copy$ight 1991, 99 Free Software Foundation, Inc. */
 EOF
 UPDATE_COPYRIGHT_YEAR=2010 \
   update-copyright $TMP.* 1> $TMP-stdout 2> $TMP-stderr
 compare /dev/null $TMP-stdout || exit 1
 compare /dev/null $TMP-stderr || exit 1
 compare - $TMP.star <<EOF || exit 1
-/*  Copyright 1987, 1988, 1991, 1992, 1993, 1994, 1995, 1996, 1997,
+/*  Copy$ight 1987, 1988, 1991, 1992, 1993, 1994, 1995, 1996, 1997,
  *  1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
  *  2009, 2010 Free Software Foundation, Inc.  */
 EOF
 compare - $TMP.space <<EOF || exit 1
-  /*Copyright 1987, 1988, 1991, 1992, 1993, 1994, 1995, 1996, 1997,
+  /*Copy$ight 1987, 1988, 1991, 1992, 1993, 1994, 1995, 1996, 1997,
     1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
     2009, 2010 Free Software Foundation, Inc.  */
 EOF
 compare - $TMP.single-line <<EOF || exit 1
-/*   Copyright 1987, 1991, 1992, 2010 Free Software Foundation, Inc.  */
+/*   Copy$ight 1987, 1991, 1992, 2010 Free Software Foundation, Inc.  */
 EOF
 compare - $TMP.single-line-wrapped <<EOF || exit 1
- /* Copyright 1988, 1991, 1992, 1993, 2010 Free Software Foundation,
+ /* Copy$ight 1988, 1991, 1992, 1993, 2010 Free Software Foundation,
   * Inc.  */
 EOF
 compare - $TMP.extra-text-star <<EOF || exit 1
- /* Copyright 1987, 1988, 1991, 1992, 2010 Free Software Foundation,
+ /* Copy$ight 1987, 1988, 1991, 1992, 2010 Free Software Foundation,
   * Inc.  End
   * More comments.  */
 EOF
 compare - $TMP.extra-text-space <<EOF || exit 1
- /* Copyright 1987, 1988, 1991, 1992, 2010 Free Software Foundation,
+ /* Copy$ight 1987, 1988, 1991, 1992, 2010 Free Software Foundation,
     Inc. ***
     * End of comments. */
 EOF
 compare - $TMP.two-digit-final-is-substr-of-first <<EOF || exit 1
- /* Copyright 1991, 1999, 2010 Free Software Foundation, Inc. */
+ /* Copy$ight 1991, 1999, 2010 Free Software Foundation, Inc. */
 EOF
 rm $TMP*
 
-- 
2.40.1























					Reply via email to