From fdbc51a665fb51381014eaa75335b8f352a916d5 Mon Sep 17 00:00:00 2001 From: Eric Blake 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 @&t@. Use fewer macros. Signed-off-by: Eric Blake --- ChangeLog | 7 +++++++ tests/local.at | 18 ++++++------------ 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index fbbc671db..a98941a14 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-11-19 Eric Blake + + 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 Use fn for shell functions, func for autoconf CHECK_FUNCS. diff --git a/tests/local.at b/tests/local.at index 9f52a682b..041d1035b 100644 --- a/tests/local.at +++ b/tests/local.at @@ -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])])]) -- 2.47.3