[PATCH] tests: avoid false positive due to change in --help formatting

[Jim Meyering]

I updated to the latest from master and noticed that "make check"
showed a single failing test.  Here's the fix:

[Because --help now looks like this:

  --disable-maintainer-mode
                          disable make rules and dependencies not useful (and
 Presumably, before the description was on the same line
 as the option name.  ]


>From f2be2788fc3ee1710cf9a6f21ddc6ba33be29b90 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyer...@redhat.com>
Date: Fri, 4 Nov 2011 10:48:31 +0100
Subject: [PATCH] tests: avoid false positive due to change in --help
 formatting

* tests/maintmode-configure-msg.test: Truncate regexp, now that
--enable-maintainer-mode and its description are on separate lines
in --help output.  Do the same for --disable-maintainer-mode.
---
 ChangeLog                          |    7 +++++++
 tests/maintmode-configure-msg.test |    6 +++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7363e1a..de7aff0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-11-04  Jim Meyering  <meyer...@redhat.com>
+
+       tests: avoid false positive due to change in --help formatting
+       * tests/maintmode-configure-msg.test: Truncate regexp,
+       now that --enable-maintainer-mode and its description are on
+       separate lines in --help output.
+
 2011-11-03  Stefano Lattarini  <stefano.lattar...@gmail.com>

        tests: various minor tweakings, mostly related to AM_PROG_AR
diff --git a/tests/maintmode-configure-msg.test 
b/tests/maintmode-configure-msg.test
index 5771392..a8398e6 100755
--- a/tests/maintmode-configure-msg.test
+++ b/tests/maintmode-configure-msg.test
@@ -51,7 +51,7 @@ $AUTOCONF --force

 ./configure --help >stdout || { cat stdout; Exit 1; }
 cat stdout
-grep '^  *--enable-maintainer-mode.* enable make rules' stdout
+grep '^  *--enable-maintainer-mode' stdout

 check_configure_message_with "no"
 check_configure_message_with "yes" --enable-maintainer-mode
@@ -61,7 +61,7 @@ set_maintmode "disable"
 $AUTOCONF --force
 ./configure --help >stdout || { cat stdout; Exit 1; }
 cat stdout
-grep '^  *--enable-maintainer-mode.* enable make rules' stdout
+grep '^  *--enable-maintainer-mode' stdout

 check_configure_message_with "no"
 check_configure_message_with "yes" --enable-maintainer-mode
@@ -71,7 +71,7 @@ set_maintmode "enable"
 $AUTOCONF --force
 ./configure --help >stdout || { cat stdout; Exit 1; }
 cat stdout
-grep '^  *--disable-maintainer-mode.* disable make rules' stdout
+grep '^  *--disable-maintainer-mode' stdout

 check_configure_message_with "yes"
 check_configure_message_with "no" --disable-maintainer-mode
--
1.7.8.rc0.35.gee6df