X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=tests%2Ftest-argp-version-etc-1.sh;h=b1f340e6666068d9e1aa4ac8664516ad6b3c74b5;hb=977389d936eb39475d8540651074ab48fcfd85a1;hp=fb079ddb103340daa72381c258b257cadc6e9db9;hpb=4b05d4e5fa7e1a7affd08576388c08b10bcf8cf0;p=gnulib.git

diff --git a/tests/test-argp-version-etc-1.sh b/tests/test-argp-version-etc-1.sh
index fb079ddb1..b1f340e66 100755
--- a/tests/test-argp-version-etc-1.sh
+++ b/tests/test-argp-version-etc-1.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Test suite for argp-version-etc.
-# Copyright (C) 2009 Free Software Foundation, Inc.
+# Copyright (C) 2009-2011 Free Software Foundation, Inc.
 # This file is part of the GNUlib Library.
 #
 # This program is free software: you can redistribute it and/or modify
@@ -23,7 +23,7 @@ ERR=0
 
 cat > $TMP <<EOT
 test-argp-version-etc (PROJECT) VERSION
-COPYRIGHT
+COPYRIGHT Free Software Foundation, Inc.
 License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>.
 This is free software: you are free to change and redistribute it.
 There is NO WARRANTY, to the extent permitted by law.
@@ -32,10 +32,10 @@ Written by Sergey Poznyakoff.
 EOT
 
 ./test-argp-version-etc${EXEEXT} --version |
- sed \
-     -e '2s/Copyright (C) [0-9]\{4,4\} Free Software Foundation, Inc\./COPYRIGHT/' \
-     -e '1s/test-argp-version-etc (.*) .*/test-argp-version-etc (PROJECT) VERSION/' \
-     -e 's/\r//g' |
+ sed '1s/test-argp-version-etc (.*) .*/test-argp-version-etc (PROJECT) VERSION/
+      /^Packaged by/d
+      2,3 s/Copyright (C) [0-9]\{4,4\}/COPYRIGHT/' |
+ tr -d '\015' |
  diff -c $TMP - || ERR=1
 
 rm $TMP