* tests/atgeneral.m4: s/Testing suite/Test suite/g.

From Jim.
(AT_INIT): Adjust the error message on invalid options.
* tests/foreign.at (Libtool): Skip Libtool 1.3 too.

diff --git a/ChangeLog b/ChangeLog
index fb7d38ca9a7a83e3424edb8e1a33e148b7557f6a..b7092e387d3b77a1143441b37f368035c83ce8c0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-03-20  Akim Demaille  <akim@epita.fr>
+
+       * tests/atgeneral.m4: s/Testing suite/Test suite/g.
+       From Jim.
+       (AT_INIT): Adjust the error message on invalid options.
+       * tests/foreign.at (Libtool): Skip Libtool 1.3 too.
+
 2001-03-20  Kevin Ryde  <user42@zip.com.au>
 
        * doc/autoconf.texi: A couple of grammatical tweaks.

diff --git a/lib/autotest/general.m4 b/lib/autotest/general.m4
index 8d458998b8b044a40272f6677e0325a3fb8dc0da..fff5c97c76ea199a05b4413a28125e665e2621fa 100644 (file)
--- a/lib/autotest/general.m4
+++ b/lib/autotest/general.m4
@@ -83,7 +83,7 @@ m4_define([AT_LINE],
 
 # AT_INIT(PROGRAM)
 # ----------------
-# Begin testing suite, using PROGRAM to check version.  The search path
+# Begin test suite, using PROGRAM to check version.  The search path
 # should be already preset so the proper executable will be selected.
 m4_define([AT_INIT],
 [m4_define([AT_ordinal], 0)
@@ -149,7 +149,9 @@ while test $[#] -gt 0; do
     [[0-9] | [0-9][0-9] | [0-9][0-9][0-9] | [0-9][0-9][0-9][0-9]])
         at_tests="$at_tests$[1] ";;
 
-     *) echo 1>&2 "Try \`$[0] --help' for more information."; exit 1 ;;
+     *) echo "$as_me: invalid option: $[1]" >&2
+        echo "Try \`$[0] --help' for more information." >&2
+        exit 1 ;;
   esac
   shift
 done
@@ -204,7 +206,7 @@ fi
 
 # Tester and tested.
 if $1 --version | grep "$at_package.*$at_version" >/dev/null; then
-  AS_BOX([Testing suite for $at_package $at_version])
+  AS_BOX([Test suite for $at_package $at_version])
 else
   AS_BOX([ERROR: Not using the proper version, no tests performed])
   exit 1
@@ -267,7 +269,7 @@ m4_divert([TAIL])[]dnl
   esac
 done
 
-# Wrap up the testing suite with summary statistics.
+# Wrap up the test suite with summary statistics.
 
 rm -f at-check-line at-setup-line
 at_skip_count=`set dummy $at_skip_list; shift; echo $[#]`
@@ -306,7 +308,7 @@ elif test $at_debug = false; then
   echo 'in the file '$[0]'.log.'
 
   {
-    AS_BOX([Testing suite log for $at_package $at_version])
+    AS_BOX([Test suite log for $at_package $at_version])
     echo
 
     # Try to find a few ChangeLogs in case it might help determining the

diff --git a/tests/atgeneral.m4 b/tests/atgeneral.m4
index 8d458998b8b044a40272f6677e0325a3fb8dc0da..fff5c97c76ea199a05b4413a28125e665e2621fa 100644 (file)
--- a/tests/atgeneral.m4
+++ b/tests/atgeneral.m4
@@ -83,7 +83,7 @@ m4_define([AT_LINE],
 
 # AT_INIT(PROGRAM)
 # ----------------
-# Begin testing suite, using PROGRAM to check version.  The search path
+# Begin test suite, using PROGRAM to check version.  The search path
 # should be already preset so the proper executable will be selected.
 m4_define([AT_INIT],
 [m4_define([AT_ordinal], 0)
@@ -149,7 +149,9 @@ while test $[#] -gt 0; do
     [[0-9] | [0-9][0-9] | [0-9][0-9][0-9] | [0-9][0-9][0-9][0-9]])
         at_tests="$at_tests$[1] ";;
 
-     *) echo 1>&2 "Try \`$[0] --help' for more information."; exit 1 ;;
+     *) echo "$as_me: invalid option: $[1]" >&2
+        echo "Try \`$[0] --help' for more information." >&2
+        exit 1 ;;
   esac
   shift
 done
@@ -204,7 +206,7 @@ fi
 
 # Tester and tested.
 if $1 --version | grep "$at_package.*$at_version" >/dev/null; then
-  AS_BOX([Testing suite for $at_package $at_version])
+  AS_BOX([Test suite for $at_package $at_version])
 else
   AS_BOX([ERROR: Not using the proper version, no tests performed])
   exit 1
@@ -267,7 +269,7 @@ m4_divert([TAIL])[]dnl
   esac
 done
 
-# Wrap up the testing suite with summary statistics.
+# Wrap up the test suite with summary statistics.
 
 rm -f at-check-line at-setup-line
 at_skip_count=`set dummy $at_skip_list; shift; echo $[#]`
@@ -306,7 +308,7 @@ elif test $at_debug = false; then
   echo 'in the file '$[0]'.log.'
 
   {
-    AS_BOX([Testing suite log for $at_package $at_version])
+    AS_BOX([Test suite log for $at_package $at_version])
     echo
 
     # Try to find a few ChangeLogs in case it might help determining the

diff --git a/tests/foreign.at b/tests/foreign.at
index 04203c18f111d9c01ba19c1a3265364edc319627..0bcaba00dec11fb2a4911b5717464d34f069d703 100644 (file)
--- a/tests/foreign.at
+++ b/tests/foreign.at
@@ -6,13 +6,13 @@ AT_BANNER([Compatibility with other tools.])
 ## Autoconf & Libtool.  ##
 ## -------------------- ##
 
-AT_SETUP([[Autoconf & Libtool]])
+AT_SETUP([[Libtool]])
 
 # Skip this test if there is no libtoolize.
 AT_CHECK([libtoolize --version || exit 77],
          ignore, ignore, ignore)
 # CVS Autoconf does not work with Libtool 1.3.5.
-AT_CHECK([[libtoolize --version | grep '1.3.[012345]' && exit 77]],
+AT_CHECK([[libtoolize --version | egrep '1\.3(\.[0-5])?$' && exit 77]],
          ignore, ignore, ignore)
 
 # FIXME: Once Libtool `configure.ac' aware, change this.