autoconf-commit
[Top][All Lists]
Advanced

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

[SCM] GNU Autoconf source repository branch, master, updated. v2.64-79-g


From: Ralf Wildenhues
Subject: [SCM] GNU Autoconf source repository branch, master, updated. v2.64-79-g096220d
Date: Sun, 01 Nov 2009 00:06:36 +0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Autoconf source repository".

http://git.sv.gnu.org/gitweb/?p=autoconf.git;a=commitdiff;h=096220df5d30ed92e2280731f98fd8014d78c44d

The branch, master has been updated
       via  096220df5d30ed92e2280731f98fd8014d78c44d (commit)
       via  0d37b401f1f7682e77fa7ce8bdee22a4191d1635 (commit)
       via  c78135a4dee915c0ef8f34df9b179c9b88742a7a (commit)
      from  5f17d8f0d3ac238433f12bbab588aafbdb0ff4bb (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 096220df5d30ed92e2280731f98fd8014d78c44d
Author: Ralf Wildenhues <address@hidden>
Date:   Sun Nov 1 01:04:31 2009 +0100

    Micro-optimization of config.status substitution.
    
    * lib/autoconf/status.m4 (_AC_OUTPUT_FILES_PREPARE): No need to
    concatenate an empty second string, when we have exactly 148
    characters to substitute.
    * tests/torture.at (Substitute a 2000-byte string): Add test
    exposure for runs of backslashes near the 148 character limit.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

commit 0d37b401f1f7682e77fa7ce8bdee22a4191d1635
Author: Ralf Wildenhues <address@hidden>
Date:   Sat Oct 31 17:24:05 2009 +0100

    Fix testsuite failure on AIX 4.3.3.
    
    * lib/autoconf/general.m4 (_AC_RUN_LOG_LIMIT): Remove conftest.err
    also if it is empty.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

commit c78135a4dee915c0ef8f34df9b179c9b88742a7a
Author: Ralf Wildenhues <address@hidden>
Date:   Sat Oct 31 17:04:38 2009 +0100

    Fix testsuite failure on IRIX and AIX.
    
    * tests/torture.at (Substitute and define special characters):
    Double the backslash before the double-quote in
    AC_DEFINE_UNQUOTED, as documented for here-documents.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog               |   18 ++++++++++++++++++
 lib/autoconf/general.m4 |    2 +-
 lib/autoconf/status.m4  |    4 ++--
 tests/torture.at        |   40 ++++++++++++++++++++++++++++++++++++++--
 4 files changed, 59 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 31b805a..2640226 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2009-10-31  Ralf Wildenhues  <address@hidden>
+
+       Micro-optimization of config.status substitution.
+       * lib/autoconf/status.m4 (_AC_OUTPUT_FILES_PREPARE): No need to
+       concatenate an empty second string, when we have exactly 148
+       characters to substitute.
+       * tests/torture.at (Substitute a 2000-byte string): Add test
+       exposure for runs of backslashes near the 148 character limit.
+
+       Fix testsuite failure on AIX 4.3.3.
+       * lib/autoconf/general.m4 (_AC_RUN_LOG_LIMIT): Remove conftest.err
+       also if it is empty.
+
+       Fix testsuite failure on IRIX and AIX.
+       * tests/torture.at (Substitute and define special characters):
+       Double the backslash before the double-quote in
+       AC_DEFINE_UNQUOTED, as documented for here-documents.
+
 2009-10-31  Eric Blake  <address@hidden>
 
        Fix cross-manual link to gcc.
diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index bd19e82..e34bea4 100644
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -2305,8 +2305,8 @@ AC_DEFUN([_AC_RUN_LOG_LIMIT],
 ... rest of stderr output deleted ...
          m4_default([$3], [10])q' conftest.err >conftest.er1
     cat conftest.er1 >&AS_MESSAGE_LOG_FD
-    rm -f conftest.er1 conftest.err
   fi
+  rm -f conftest.er1 conftest.err
   _AS_ECHO_LOG([\$? = $ac_status])
   test $ac_status = 0; }])
 
diff --git a/lib/autoconf/status.m4 b/lib/autoconf/status.m4
index 84ee6c3..e921d97 100644
--- a/lib/autoconf/status.m4
+++ b/lib/autoconf/status.m4
@@ -462,7 +462,7 @@ s/'"$ac_delim"'$//
 t delim
 :nl
 h
-s/\(.\{]_AC_AWK_LITERAL_LIMIT[\}\).*/\1/
+s/\(.\{]_AC_AWK_LITERAL_LIMIT[\}\)..*/\1/
 t more1
 s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
 p
@@ -476,7 +476,7 @@ s/.\{]_AC_AWK_LITERAL_LIMIT[\}//
 t nl
 :delim
 h
-s/\(.\{]_AC_AWK_LITERAL_LIMIT[\}\).*/\1/
+s/\(.\{]_AC_AWK_LITERAL_LIMIT[\}\)..*/\1/
 t more2
 s/["\\]/\\&/g; s/^/"/; s/$/"/
 p
diff --git a/tests/torture.at b/tests/torture.at
index b2fc7c3..ea3acd4 100644
--- a/tests/torture.at
+++ b/tests/torture.at
@@ -729,6 +729,9 @@ AT_CLEANUP
 # So we'll just test a 2000-byte value, and for awk, we test a line with
 # almost 1000 words, and one variable with 5 lines of 2000 bytes each:
 # multi-line values should allow to get around the limitations.
+# We also test runs of around 148 backslashes: they need to be escaped,
+# and 148 is the portable limit for awk string literals.  config.status
+# uses concatenation to generate longer strings.
 
 AT_SETUP([Substitute a 2000-byte string])
 
@@ -738,6 +741,13 @@ AT_DATA([Bar.in], address@hidden@
 ])
 AT_DATA([Baz.in], address@hidden@
 ])
+AT_DATA([Boo.in], address@hidden@
address@hidden@
address@hidden@
address@hidden@
address@hidden@
address@hidden@
+])
 
 AT_DATA([configure.ac],
 [[AC_INIT
@@ -747,13 +757,38 @@ baz="]m4_for([m], 1, 100,, ... ... ... ... ....)[
 "
 baz=$baz$baz$baz$baz$baz
 AC_SUBST([baz])
+b29='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+b147=$b29$b29$b29$b29$b29'\\'
+b148=$b147'\'
+b149=$b148'\'
+b295=$b147$b147'\'
+b296=$b295'\'
+b297=$b296'\'
+AC_SUBST([b147])
+AC_SUBST([b148])
+AC_SUBST([b149])
+AC_SUBST([b295])
+AC_SUBST([b296])
+AC_SUBST([b297])
 AC_PROG_AWK
-AC_CONFIG_FILES([Foo Bar Baz])
+AC_CONFIG_FILES([Foo Bar Baz Boo])
 AC_OUTPUT
 ]])
 
 cp "$abs_top_srcdir/build-aux/install-sh" .
 
+b29='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+b147=$b29$b29$b29$b29$b29'\\'
+b295=$b147$b147'\'
+cat >Boo-exp <<EOF
+$b147
+$b147\\
+$b147\\\\
+$b295
+$b295\\
+$b295\\\\
+EOF
+
 AT_CHECK_AUTOCONF
 # Check both awk and the result of AC_PROG_AWK
 for awk_arg in Foo= AWK=awk; do
@@ -766,6 +801,7 @@ for awk_arg in Foo= AWK=awk; do
   [m4_for([n], 1, 5,, m4_for([m], 1, 100,, ... ... ... ... ....)
 )])
   AT_CHECK([cat Baz], 0, [stdout])
+  AT_CHECK([diff Boo-exp Boo])
 done
 AT_CLEANUP
 
@@ -858,7 +894,7 @@ AC_DEFINE_UNQUOTED([unq3], ["$baz"], [unquoted, test 3])
 AC_DEFINE_UNQUOTED([unq4], [${baz+set}], [unquoted, test 4])
 AC_DEFINE_UNQUOTED([unq5], ["${baz+`echo "a b"`}"], [unquoted, test 5])
 AC_DEFINE_UNQUOTED([unq6], [`echo hi`], [unquoted, test 6])
-AC_DEFINE_UNQUOTED([unq7], ['\"'], [unquoted, test 7])
+AC_DEFINE_UNQUOTED([unq7], ['\\"'], [unquoted, test 7])
 AC_PROG_AWK
 AC_CONFIG_FILES([Foo Zardoz])]])
 


hooks/post-receive
-- 
GNU Autoconf source repository




reply via email to

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