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>

diff --git a/ChangeLog b/ChangeLog
index 649834bf25fb1a1d18bc0e8b0df23b53afc43d01..a868d1daa347d7627cb744655855b1d410915040 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 d1a14e619e8f66191c1c6cbb9bf9c627d7afb8ab..302220ee0b60ca20f63d4d9408360a4a68e14488 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 528fadd9ece388c770849526529d6a8e0e2c3422..071764a0b69f88ae4b6ab56b64db11e03d12dfe9 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