Re: test-version-etc.sh fails when using the --with-packager-... configure options

[Eric Blake]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

[adding gnulib]

According to Mike Frysinger on 11/18/2009 8:12 PM:
> the test-version-etc.sh falls over when configured with:
> --with-packager=Gentoo --with-packager-version='8.1 (p1)'
> 
> ! 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.                       
>   
> --- 1,6 ----
>   test-version-etc (PROJECT) VERSION
> ! Packaged by Gentoo (8.1 (p1))
> ! Copyright (C) 2009 Free Software Foundation, Inc.

Yep - bug in the gnulib test, for not discarding the "Packaged by" line.
This should fix it.  Tested with

CFLAGS=-DPACKAGE_PACKAGER='\"me\"' \
  ./gnulib-tool --with-tests --test version-etc

I didn't check whether argp-version-etc has the same problem, but since
they are similar, I'll apply the same patch anyway.

- --
Don't work too hard, make some time for fun as well!

Eric Blake             address@hidden
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Public key at home.comcast.net/~ericblake/eblake.gpg
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAksEvsgACgkQ84KuGfSFAYAqHACggJ7FGABYu7QkHqf+je4al/3l
QngAoJVmKofg3NPawryAmOT7d1VRUpZ2
=vEbk
-----END PGP SIGNATURE-----

>From 8cfd4a9028280e7205c7d1a70c2709706627e98d Mon Sep 17 00:00:00 2001
From: Eric Blake <address@hidden>
Date: Wed, 18 Nov 2009 20:36:01 -0700
Subject: [PATCH] tests: avoid false negative with --with-packager

Ignore extra line produced by version-etc.

* tests/test-version-etc.sh: Discard packager information.
* tests/test-argp-version-etc-1.sh: Likewise.
Reported by Mike Frysinger.

Signed-off-by: Eric Blake <address@hidden>
---
 ChangeLog                        |    5 +++++
 tests/test-argp-version-etc-1.sh |    3 ++-
 tests/test-version-etc.sh        |    3 ++-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 649834b..a868d1d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2009-11-18  Eric Blake  <address@hidden>

+       tests: avoid false negative with --with-packager
+       * tests/test-version-etc.sh: Discard packager information.
+       * tests/test-argp-version-etc-1.sh: Likewise.
+       Reported by Mike Frysinger.
+
        utimens: fix regression on Solaris
        * m4/utimens.m4 (gl_UTIMENS): Check for BSD bug.
        * lib/utimens.c (fdutimens): Revert 2009-11-08 change; Solaris 10
diff --git a/tests/test-argp-version-etc-1.sh b/tests/test-argp-version-etc-1.sh
index d1a14e6..302220e 100755
--- a/tests/test-argp-version-etc-1.sh
+++ b/tests/test-argp-version-etc-1.sh
@@ -33,7 +33,8 @@ EOT

 ./test-argp-version-etc${EXEEXT} --version |
  sed '1s/test-argp-version-etc (.*) .*/test-argp-version-etc (PROJECT) VERSION/
-      2s/Copyright (C) [0-9]\{4,4\}/COPYRIGHT/' |
+      /^Packaged by/d
+      2,3 s/Copyright (C) [0-9]\{4,4\}/COPYRIGHT/' |
  tr -d '\015' |
  diff -c $TMP - || ERR=1

diff --git a/tests/test-version-etc.sh b/tests/test-version-etc.sh
index 528fadd..071764a 100755
--- a/tests/test-version-etc.sh
+++ b/tests/test-version-etc.sh
@@ -33,7 +33,8 @@ EOT

 ./test-version-etc${EXEEXT} --version |
  sed '1s/test-version-etc (.*) .*/test-version-etc (PROJECT) VERSION/
-      2s/Copyright (C) [0-9]\{4,4\}/COPYRIGHT/' |
+      /^Packaged by/d
+      2,3 s/Copyright (C) [0-9]\{4,4\}/COPYRIGHT/' |
  tr -d '\015' |
  diff -c $TMP - || ERR=1

-- 
1.6.5.rc1