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 <ebb9@byu.net>
(cherry picked from commit 8cfd4a9028280e7205c7d1a70c2709706627e98d)

diff --git a/ChangeLog b/ChangeLog
index 46dd660..1e8778d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2009-11-18  Eric Blake  <ebb9@byu.net>
 
+       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 (executable)
--- 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 (executable)
--- 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