From 8cfd4a9028280e7205c7d1a70c2709706627e98d Mon Sep 17 00:00:00 2001 From: Eric Blake 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 --- 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 649834bf25..a868d1daa3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2009-11-18 Eric Blake + 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 d1a14e619e..302220ee0b 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 528fadd9ec..071764a0b6 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 -- 2.30.2