tests: simplify grepping of 'automake --version'.

* tests/tools.at (autom4te preselections): Remove minor
redundancies in regular expressions used to grep the output
'automake --version' for test skipping.
* tests/torture.at (Configuring subdirectories)
(Unusual Automake input files): Likewise.

Signed-off-by: Eric Blake <eblake@redhat.com>

diff --git a/ChangeLog b/ChangeLog
index fac4c15bf4c15a9a42045496956c8b0e617c56c6..be3c8a046701c905655b634d2ccad8d898a32268 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-09-13  Stefano Lattarini  <stefano.lattarini@gmail.com>
+
+       tests: simplify grepping of 'automake --version'.
+       * tests/tools.at (autom4te preselections): Remove minor
+       redundancies in regular expressions used to grep the output
+       'automake --version' for test skipping.
+       * tests/torture.at (Configuring subdirectories)
+       (Unusual Automake input files): Likewise.
+
 2010-09-13  Eric Blake  <eblake@redhat.com>
 
        autotest: work around zsh bug

diff --git a/tests/tools.at b/tests/tools.at
index bd50a64354afdcbae635e308b69119a46f953cfc..c89ac4c81a0b3118d69981a533b593c9d8d451f4 100644 (file)
--- a/tests/tools.at
+++ b/tests/tools.at
@@ -1166,7 +1166,7 @@ AT_SETUP([autom4te preselections])
 
 # We use aclocal and automake.  Skip broken automake wrappers.
 AT_CHECK([automake --version || exit 77], [], [stdout], [ignore])
-AT_CHECK([[grep '[1-9]\.[0-9][0-9]*' stdout || exit 77]], [], [ignore])
+AT_CHECK([[grep '[1-9]\.[0-9]' stdout || exit 77]], [], [ignore])
 AT_CHECK([test ! -f $HOME/.autom4te.cfg || exit 77], [], [ignore], [ignore])
 
 AT_DATA([configure.in],

diff --git a/tests/torture.at b/tests/torture.at
index 7fd85a267543ac5609318663517f2df101d7a617..673c7a596a238be56e6c81e71647c3b603927c71 100644 (file)
--- a/tests/torture.at
+++ b/tests/torture.at
@@ -1429,7 +1429,7 @@ AT_KEYWORDS(autoreconf)
 
 # We use aclocal (via autoreconf).
 AT_CHECK([aclocal --version || exit 77], [], [stdout], [ignore])
-AT_CHECK([[grep '[1-9]\.[0-9][0-9]*' stdout || exit 77]], [], [ignore])
+AT_CHECK([[grep '[1-9]\.[0-9]' stdout || exit 77]], [], [ignore])
 
 # It should understand configure.ac.
 AT_CHECK([[grep '[^0-9]1\.[01234][^0-9]' stdout && exit 77]], [1], [ignore])
@@ -1812,7 +1812,7 @@ AT_KEYWORDS([autoreconf])
 
 # We use aclocal and automake via autoreconf.
 AT_CHECK([automake --version || exit 77], [], [stdout], [ignore])
-AT_CHECK([[grep '[1-9]\.[0-9][0-9]*' stdout || exit 77]], [], [ignore])
+AT_CHECK([[grep '[1-9]\.[0-9]' stdout || exit 77]], [], [ignore])
 
 AT_DATA([configure.in],
 [[AC_INIT(GNU foo, 1.0)