autoreconf tests: make “running: something” regexes more generous

Under some conditions you get “running: /absolute/path/bin/autoconf”
instead of just “running: autoconf” and the checks weren’t expecting
this.

Caught by ‘make distcheck’.

diff --git a/tests/torture.at b/tests/torture.at
index 889158346d682119f7dece8ddbad20bf610a0911..d0e568e5a3cba19bc8e772eee91811a98a2f6d77 100644 (file)
--- a/tests/torture.at
+++ b/tests/torture.at
@@ -2073,7 +2073,7 @@ $LIBTOOLIZE -n -v -i 2> /dev/null |
   while read f; do cp "$f" m4; done
 
 AT_CHECK([autoreconf -Wall -v -i], 0, [ignore], [stderr])
-AT_CHECK([$EGREP 'running: libtoolize' stderr], 0, [ignore], [ignore])
+AT_CHECK([$EGREP 'running: .*libtoolize' stderr], 0, [ignore], [ignore])
 
 AT_CHECK_CONFIGURE
 
@@ -2112,7 +2112,7 @@ SUBDIRS = po
 # autoreconf runs autopoint before aclocal, so we don't need to
 # worry about the m4 files being unavailable as we do for libtool.
 AT_CHECK([autoreconf -Wall -v -i], 0, [ignore], [stderr])
-AT_CHECK([$EGREP 'running: autopoint' stderr], 0, [ignore], [ignore])
+AT_CHECK([$EGREP 'running: .*autopoint' stderr], 0, [ignore], [ignore])
 
 AT_CHECK_CONFIGURE([--no-create])
 
@@ -2160,7 +2160,7 @@ SUBDIRS = po
 # autoreconf runs autopoint before aclocal, so we don't need to
 # worry about the m4 files being unavailable as we do for libtool.
 AT_CHECK([autoreconf -Wall -v -i], 0, [ignore], [stderr])
-AT_CHECK([$EGREP 'running: autopoint' stderr], 0, [ignore], [ignore])
+AT_CHECK([$EGREP 'running: .*autopoint' stderr], 0, [ignore], [ignore])
 
 # The requested version of gettext.m4 is new enough that its
 # po/Makefile.in.in does not provoke warnings from config.status.
@@ -2202,7 +2202,7 @@ AT_CHECK([autoreconf -Wall -v -i], 0, [ignore], [stderr])
 # configure script will not work.
 
 AS_IF([$at_autopoint_modern], [
-  AT_CHECK([$EGREP 'running: autopoint' stderr], 0, [ignore], [ignore])
+  AT_CHECK([$EGREP 'running: .*autopoint' stderr], 0, [ignore], [ignore])
   AT_CHECK_CONFIGURE
 ], [
   AT_CHECK([$EGREP 'not running autopoint because it is too old' stderr],
@@ -2244,7 +2244,7 @@ AT_CHECK([autoreconf -Wall -v -i], 0, [ignore], [stderr])
 # configure script will not work.
 
 AS_IF([$at_autopoint_modern], [
-  AT_CHECK([$EGREP 'running: autopoint' stderr], 0, [ignore], [ignore])
+  AT_CHECK([$EGREP 'running: .*autopoint' stderr], 0, [ignore], [ignore])
   AT_CHECK_CONFIGURE
 ], [
   AT_CHECK([$EGREP 'not running autopoint because it is too old' stderr],
@@ -2286,7 +2286,7 @@ AT_CHECK([autoreconf -Wall -v -i], 0, [ignore], [stderr])
 # configure script will not work.
 
 AS_IF([$at_autopoint_modern], [
-  AT_CHECK([$EGREP 'running: autopoint' stderr], 0, [ignore], [ignore])
+  AT_CHECK([$EGREP 'running: .*autopoint' stderr], 0, [ignore], [ignore])
   AT_CHECK_CONFIGURE
 ], [
   AT_CHECK([$EGREP 'not running autopoint because it is too old' stderr],
@@ -2329,7 +2329,7 @@ rm -f state-ls.after
 # definition for AM_INIT_AUTOMAKE and bomb out.
 AT_CHECK([autoreconf -Wall -v -i -x aclocal,automake], 1, [], [stderr])
 AT_CHECK([$EGREP 'not running aclocal' stderr], 0, [ignore], [ignore])
-AT_CHECK([$EGREP 'running: autoconf' stderr], 0, [ignore], [ignore])
+AT_CHECK([$EGREP 'running: .*autoconf' stderr], 0, [ignore], [ignore])
 AT_CHECK(
   [$EGREP 'error: undefined or overquoted macro: AM_INIT_AUTOMAKE' stderr],
   0, [ignore], [ignore])
@@ -2344,7 +2344,7 @@ AT_DATA([aclocal.m4],
 # autoreconf detects that our stub aclocal.m4 was not generated by aclocal.
 AT_CHECK([autoreconf -Wall -v -i -x aclocal,automake], 0, [], [stderr])
 AT_CHECK([$EGREP 'not using aclocal' stderr], 0, [ignore], [ignore])
-AT_CHECK([$EGREP 'running: autoconf' stderr], 0, [ignore], [ignore])
+AT_CHECK([$EGREP 'running: .*autoconf' stderr], 0, [ignore], [ignore])
 AT_CHECK(
   [$EGREP 'error: undefined or overquoted macro: AM_INIT_AUTOMAKE' stderr],
   1, [ignore], [ignore])