Improve testsuite generation.

* tests/local.at (AT_DATA_M4SUGAR, AT_DATA_M4SH)
(AT_DATA_AUTOCONF): Escape all quadrigraphs, not just @&t@.  Use
fewer macros.

Signed-off-by: Eric Blake <ebb9@byu.net>
This commit is contained in:
Eric Blake 2008-11-19 09:25:22 -07:00
parent 667dcc0c30
commit fdbc51a665
2 changed files with 13 additions and 12 deletions

View File

@ -1,3 +1,10 @@
2008-11-19 Eric Blake <ebb9@byu.net>
Improve testsuite generation.
* tests/local.at (AT_DATA_M4SUGAR, AT_DATA_M4SH)
(AT_DATA_AUTOCONF): Escape all quadrigraphs, not just @&t@. Use
fewer macros.
2008-11-18 Eric Blake <ebb9@byu.net>
Use fn for shell functions, func for autoconf CHECK_FUNCS.

View File

@ -134,10 +134,8 @@ m4_define([AT_CHECK_AUTOM4TE],
# Escape the invalid tokens with @&t@.
m4_define([AT_DATA_M4SUGAR],
[AT_DATA([$1],
[m4_bpatsubsts([$2],
[@&t@], [@&@&t@t@],
[\(m4\)_], [\1@&t@_],
[dnl], [d@&t@nl])])])
[m4_bpatsubst([$2], [\(@.\)\(.@\)\|\(m4\)\(_\)\|\(d\)\(nl\)],
[\1\3\5@&t@\2\4\6])])])
# 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 @&t@.
m4_define([AT_DATA_M4SH],
[AT_DATA([$1],
[m4_bpatsubsts([$2],
[@&t@], [@&@&t@t@],
[\(m4\|AS\)_], [\1@&t@_],
[dnl], [d@&t@nl])])])
[m4_bpatsubst([$2], [\(@.\)\(.@\)\|\(m4\|AS\)\(_\)\|\(d\)\(nl\)],
[\1\3\5@&t@\2\4\6])])])
# AT_CHECK_M4SH(FLAGS, [EXIT-STATUS = 0], STDOUT, STDERR)
@ -183,10 +179,8 @@ m4_define([AT_CHECK_M4SH],
# Escape the invalid tokens with @&t@.
m4_define([AT_DATA_AUTOCONF],
[AT_DATA([$1],
[m4_bpatsubsts([$2],
[@&t@], [@&@&t@t@],
[\(m4\|AS\|AC\)_], [\1@&t@_],
[dnl], [d@&t@nl])])])
[m4_bpatsubst([$2], [\(@.\)\(.@\)\|\(m4\|AS\|AC\)\(_\)\|\(d\)\(nl\)],
[\1\3\5@&t@\2\4\6])])])