From 9144856609b28e8b4f58bca4d44489ddc23170a9 Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Mon, 13 Sep 2010 20:26:40 +0200 Subject: [PATCH] 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 --- ChangeLog | 9 +++++++++ tests/tools.at | 2 +- tests/torture.at | 4 ++-- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index fac4c15b..be3c8a04 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2010-09-13 Stefano Lattarini + + 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 autotest: work around zsh bug diff --git a/tests/tools.at b/tests/tools.at index bd50a643..c89ac4c8 100644 --- 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 7fd85a26..673c7a59 100644 --- 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) -- 2.47.2