autoconf-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Fix placing of ellipses, and fix a testsuite -v nit.


From: Ralf Wildenhues
Subject: Fix placing of ellipses, and fix a testsuite -v nit.
Date: Sun, 25 Apr 2010 19:19:41 +0200
User-agent: Mutt/1.5.20 (2009-10-28)

In the Autoconf case, the language police got lucky and found an actual
regression by chance.  So there's two patches here, the trivial one and
some fallout.  OK to commit?

I didn't actually add a space in cases such as synopses:
  usage: foo [option]...

where the spacing is significant, and anyway this is not to be confused
with natural language.

Thanks,
Ralf

    Fix autotest testsuite -v output to print test group title.
    
    * lib/autotest/general.m4 (AT_CLEANUP): Actually print test
    title in verbose output.  Fixes AUTOCONF-2.57-101-gc102ed8
    regression.
    * tests/autotest.at (AT_CHECK_AT_TITLE): Amend macro to check
    for test title in -v output.

diff --git a/lib/autotest/general.m4 b/lib/autotest/general.m4
index c12f7d9..1aa147d 100644
--- a/lib/autotest/general.m4
+++ b/lib/autotest/general.m4
@@ -1846,7 +1846,7 @@ m4_divert_pop([TEST_SCRIPT])dnl Back to TEST_GROUPS
 AT_xfail
 echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  AS_ECHO(["AT_ordinal. m4_defn([AT_line]): testing $1..."])
+  AS_ECHO(["AT_ordinal. m4_defn([AT_line]): testing $at_desc ..."])
   $at_traceon
 m4_undivert([TEST_SCRIPT])dnl Insert the code here
   set +x
diff --git a/tests/autotest.at b/tests/autotest.at
index e7808ae..c13f1c7 100644
--- a/tests/autotest.at
+++ b/tests/autotest.at
@@ -698,6 +698,10 @@ s/^.\{]]]m4_default($5, 53)[[[\}ok.*/ok/p
 [[$3
 ok
 ]])
+AT_CHECK([[$CONFIG_SHELL ./micro-suite -v |
+           sed -n 's/.*testing \(.*\) \.\.\./\1/p']],,
+[[$3
+]])
 AT_CHECK([[$CONFIG_SHELL ./micro-suite -l |
           sed -n 's/.*[0-9]: [^         ][^     ]*[     ][      ]*\(.*[^       
 ]\)[    ]*/\1/p']],,
 [[$3



    Fix placing of ellipses in English text.
    
    * lib/autoconf/general.m4 (_AC_INIT_HELP): Be sure to add a
    space before `...' in natural language text.
    * lib/autoconf/headers.m4 (_AC_CHECK_HEADER_MONGREL_BODY):
    Likewise.
    * lib/autoconf/libs.m4 (_AC_PATH_X_XMKMF): Likewise.
    * lib/autoconf/programs.m4 (AC_PROG_MAKE_SET): Likewise.
    * tests/suite.at: Likewise.
    * tests/torture.at (@%:@define header templates): Likewise.

diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index 648f606..dfcc2b3 100644
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -1027,7 +1027,7 @@ Configuration:
       --help=short        display options specific to this package
       --help=recursive    display the short help of all the included packages
   -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking...' messages
+  -q, --quiet, --silent   do not print \`checking ...' messages
       --cache-file=FILE   cache test results in FILE [disabled]
   -C, --config-cache      alias for \`--cache-file=config.cache'
   -n, --no-create         do not create output files
diff --git a/lib/autoconf/headers.m4 b/lib/autoconf/headers.m4
index e32954b..c8d34c0 100644
--- a/lib/autoconf/headers.m4
+++ b/lib/autoconf/headers.m4
@@ -125,7 +125,7 @@ esac
 #
 # This is not based on _AC_CHECK_HEADER_COMPILE and _AC_CHECK_HEADER_PREPROC
 # because it obfuscate the code to try to factor everything, in particular
-# because of the cache variables, and the `checking...' messages.
+# because of the cache variables, and the `checking ...' messages.
 AC_DEFUN([_AC_CHECK_HEADER_MONGREL],
 [AC_REQUIRE_SHELL_FN([ac_fn_]_AC_LANG_ABBREV[_check_header_mongrel],
   [AS_FUNCTION_DESCRIBE([ac_fn_]_AC_LANG_ABBREV[_check_header_mongrel],
diff --git a/lib/autoconf/libs.m4 b/lib/autoconf/libs.m4
index 73edad5..e3fa36d 100644
--- a/lib/autoconf/libs.m4
+++ b/lib/autoconf/libs.m4
@@ -177,7 +177,7 @@ libdir:
        @echo libdir='${LIBDIR}'
 _ACEOF
   if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; 
then
-    # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+    # GNU make sometimes prints "make[1]: Entering ...", which would confuse 
us.
     for ac_var in incroot usrlibdir libdir; do
       eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 
's/^$ac_var=//p'\`"
     done
diff --git a/lib/autoconf/programs.m4 b/lib/autoconf/programs.m4
index 9741f7b..4b9060f 100644
--- a/lib/autoconf/programs.m4
+++ b/lib/autoconf/programs.m4
@@ -825,7 +825,7 @@ SHELL = /bin/sh
 all:
        @echo '@@@%%%=$(MAKE)=@@@%%%'
 _ACEOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
 case `${MAKE-make} -f conftest.make 2>/dev/null` in
   *@@@%%%=?*=@@@%%%*)
     eval ac_cv_prog_make_${ac_make}_set=yes;;
diff --git a/tests/suite.at b/tests/suite.at
index 3f0ce42..17bacb7 100644
--- a/tests/suite.at
+++ b/tests/suite.at
@@ -38,7 +38,7 @@ m4_include([base.at])
 # Testing config.status
 # ---------------------
 # Actually should be named config.status.at but I fear problems with
-# the name.  Does no `checking...' at all, but exercises only code
+# the name.  Does no `checking ...' at all, but exercises only code
 # which following section use too.  Hence, run it first.
 m4_include([torture.at])
 
diff --git a/tests/torture.at b/tests/torture.at
index 82e9452..b68a21d 100644
--- a/tests/torture.at
+++ b/tests/torture.at
@@ -596,7 +596,7 @@ AT_CLEANUP
 ## Require 100 AC_DEFINE and AC_SUBST and AC_SUBST_FILE with a significantly
 ## big value.  This is mostly to check that Autoconf produces portable sed
 ## scripts in config.status.  sed is used to skip the first two lines
-## `Generated by...'.
+## `Generated by ...'.
 
 # We use m4_for many times.
 m4_pattern_allow([^m4_for$])





reply via email to

[Prev in Thread] Current Thread [Next in Thread]