On Tue, 4 Aug 2009, Jim Meyering wrote:
> Thanks for all of that.
> I've pushed that as well as your other three change sets,
> and one more change:
Thanks. Unfortunately, my email client ate the \r\n sequences in the DOS
EOL test. Sorry about that. The attached patch adds them back.
From f7aecbdf27eea1a0a6eb0960dbb34627ff56ccb6 Mon Sep 17 00:00:00 2001
From: Joel E. Denny <jde...@clemson.edu>
Date: Tue, 4 Aug 2009 09:37:54 -0400
Subject: [PATCH] update-copyright-tests: correctly test EOL=\r\n handling
* tests/test-update-copyright.sh: Add back the \r on each line,
and add a comment saying it shouldn't be removed.
---
ChangeLog | 6 ++++++
tests/test-update-copyright.sh | 14 ++++++++------
2 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 8797352..ba72930 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-08-04 Joel E. Denny <jde...@clemson.edu>
+
+ update-copyright-tests: correctly test EOL=\r\n handling
+ * tests/test-update-copyright.sh: Add back the \r on each line,
+ and add a comment saying it shouldn't be removed.
+
2009-08-04 Jim Meyering <meyer...@redhat.com>
maint.mk: make update-copyright exclusion list more configurable
diff --git a/tests/test-update-copyright.sh b/tests/test-update-copyright.sh
index b72abbb..4abc6f1 100755
--- a/tests/test-update-copyright.sh
+++ b/tests/test-update-copyright.sh
@@ -291,18 +291,20 @@ rm $TMP*
TMP=$TMP_BASE-dos-eol
cat > $TMP <<EOF
-Rem Copyright (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.
+Rem \r\n on each line is intentional; don't change-->
+Rem Copyright (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
UPDATE_COPYRIGHT_YEAR=2010 \
update-copyright $TMP 1> $TMP-stdout 2> $TMP-stderr
diff -u /dev/null $TMP-stdout || exit 1
diff -u /dev/null $TMP-stderr || exit 1
diff -u - $TMP <<EOF || exit 1
-Rem Copyright (C) 87, 88, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 98,
-Rem 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-Rem 2009-2010 Free Software Foundation, Inc.
+Rem \r\n on each line is intentional; don't change-->
+Rem Copyright (C) 87, 88, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 98,
+Rem 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+Rem 2009-2010 Free Software Foundation, Inc.
EOF
rm $TMP*
--
1.5.4.3
