[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
building the autoconf testsuite
From: |
Eric Blake |
Subject: |
building the autoconf testsuite |
Date: |
Wed, 19 Nov 2008 17:31:26 +0000 (UTC) |
User-agent: |
Loom/3.14 (http://gmane.org/) |
I was writing a test for enhanced m4_expand and encountered a weird failure,
which I traced back to AT_DATA_M4SUGAR not allowing a literal '@%:@' into the
here-doc (@%:@ became #, which I didn't want, while @%@&t@:@ was escaped into @%
@&@&address@hidden@:@). This fixes it, as well as making the autoconf
testsuite
generation slightly faster (because we aren't parsing quite so many macros;
m4_bpatsubst is more efficient than m4_bpatsubsts).
From: Eric Blake <address@hidden>
Date: Wed, 19 Nov 2008 09:25:22 -0700
Subject: [PATCH] Improve testsuite generation.
* tests/local.at (AT_DATA_M4SUGAR, AT_DATA_M4SH)
(AT_DATA_AUTOCONF): Escape all quadrigraphs, not just @&address@hidden Use
fewer macros.
Signed-off-by: Eric Blake <address@hidden>
---
ChangeLog | 7 +++++++
tests/local.at | 18 ++++++------------
2 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index fbbc671..a98941a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-11-19 Eric Blake <address@hidden>
+
+ Improve testsuite generation.
+ * tests/local.at (AT_DATA_M4SUGAR, AT_DATA_M4SH)
+ (AT_DATA_AUTOCONF): Escape all quadrigraphs, not just @&address@hidden
Use
+ fewer macros.
+
2008-11-18 Eric Blake <address@hidden>
Use fn for shell functions, func for autoconf CHECK_FUNCS.
diff --git a/tests/local.at b/tests/local.at
index 9f52a68..041d103 100644
--- a/tests/local.at
+++ b/tests/local.at
@@ -134,10 +134,8 @@ m4_define([AT_CHECK_AUTOM4TE],
# Escape the invalid tokens with @&address@hidden
m4_define([AT_DATA_M4SUGAR],
[AT_DATA([$1],
-[m4_bpatsubsts([$2],
- [@&address@hidden, [@&@&address@hidden@],
- [\(m4\)_], [\1@&address@hidden,
- [dnl], [d@&address@hidden)])])
+[m4_bpatsubst([$2], [\(@.\)\(address@hidden)\|\(m4\)\(_\)\|\(d\)\(nl\)],
+ [\1\3\5@&address@hidden)])])
# AT_CHECK_M4SUGAR(FLAGS, [EXIT-STATUS = 0], STDOUT, STDERR)
@@ -159,10 +157,8 @@ AT_CHECK_AUTOM4TE([--language=m4sugar script.4s -o script
$1],
# Escape the invalid tokens with @&address@hidden
m4_define([AT_DATA_M4SH],
[AT_DATA([$1],
-[m4_bpatsubsts([$2],
- [@&address@hidden, [@&@&address@hidden@],
- [\(m4\|AS\)_], [\1@&address@hidden,
- [dnl], [d@&address@hidden)])])
+[m4_bpatsubst([$2], [\(@.\)\(address@hidden)\|\(m4\|AS\)\(_\)\|\(d\)\(nl\)],
+ [\1\3\5@&address@hidden)])])
# AT_CHECK_M4SH(FLAGS, [EXIT-STATUS = 0], STDOUT, STDERR)
@@ -183,10 +179,8 @@ m4_define([AT_CHECK_M4SH],
# Escape the invalid tokens with @&address@hidden
m4_define([AT_DATA_AUTOCONF],
[AT_DATA([$1],
-[m4_bpatsubsts([$2],
- [@&address@hidden, [@&@&address@hidden@],
- [\(m4\|AS\|AC\)_], [\1@&address@hidden,
- [dnl], [d@&address@hidden)])])
+[m4_bpatsubst([$2],
[\(@.\)\(address@hidden)\|\(m4\|AS\|AC\)\(_\)\|\(d\)\(nl\)],
+ [\1\3\5@&address@hidden)])])
--
1.6.0.4
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- building the autoconf testsuite,
Eric Blake <=