From f79a05503dad2e4d1c14c6b9652cac7be2628a3a Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Wed, 5 Mar 2008 09:32:04 -0700 Subject: [PATCH] Encode nested autotest data. * tests/autotest.at (AT_CHECK_AT_PREP): Avoid raw AT_ in output. (unusual file names): Likewise. (m4_pattern_allow): Remove loophole, to make it easier to catch poorly written tests. Signed-off-by: Eric Blake --- ChangeLog | 6 ++++++ tests/autotest.at | 27 ++++++++++++--------------- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index d43ea696..4576d29c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2008-03-10 Eric Blake + Encode nested autotest data. + * tests/autotest.at (AT_CHECK_AT_PREP): Avoid raw AT_ in output. + (unusual file names): Likewise. + (m4_pattern_allow): Remove loophole, to make it easier to catch + poorly written tests. + Factor some autotest tests. * tests/autotest.at (AT_CHECK_AT_PREP): New macro, to factor out common initialization. diff --git a/tests/autotest.at b/tests/autotest.at index 7559fd46..fea0adc9 100644 --- a/tests/autotest.at +++ b/tests/autotest.at @@ -35,14 +35,14 @@ dnl AT_CAPTURE_FILE([$1.log])dnl dnl AT_DATA(AT_dir[/package.m4], -[[m4_define([AT_PACKAGE_NAME], [GNU Nonsense]) -m4_define([AT_PACKAGE_TARNAME], [nonsense]) -m4_define([AT_PACKAGE_VERSION], [1.0]) -m4_define([AT_PACKAGE_STRING], [GNU Nonsense 1.0]) -m4_define([AT_PACKAGE_BUGREPORT], [bug-autoconf@gnu.org]) +[[m4_define([AT@&t@_PACKAGE_NAME], [GNU Nonsense]) +m4_define([AT@&t@_PACKAGE_TARNAME], [nonsense]) +m4_define([AT@&t@_PACKAGE_VERSION], [1.0]) +m4_define([AT@&t@_PACKAGE_STRING], [GNU Nonsense 1.0]) +m4_define([AT@&t@_PACKAGE_BUGREPORT], [bug-autoconf@gnu.org]) ]]) dnl -AT_DATA(AT_dir[/$1.at], [$2]) +AT_DATA(AT_dir[/$1.at], m4_bpatsubst([[$2]], [AT_], [AT@&t@_])) m4_ifval([$6], [(cd AT_dir]) AT_CHECK_AUTOM4TE([--language=autotest -o $1 $1.at], [$3], [$4], [$5]) m4_ifval([$6], [)]) @@ -83,9 +83,6 @@ $2 AT_CLEANUP ]], m4_shift2($@))]) -# Here documents for these tests contain forbidden macros. -m4_pattern_allow([^AT_]) - # AT_NO_CMDSUBST # -------------- m4_define([AT_NO_CMDSUBST], @@ -723,17 +720,17 @@ AT_CLEANUP AT_SETUP([unusual file names]) AT_DATA_M4SUGAR([d@&t@nl.at], -[[AT_SETUP([test one]) +[[AT@&t@_SETUP([test one]) m4_pattern_allow([^dnl$]) -AT_CHECK([test "]m4_dquote(AT_LINE)[" = dn[]l.at:3]) -AT_CLEANUP +AT@&t@_CHECK([test "]m4_dquote(AT@&t@_LINE)[" = dn[]l.at:3]) +AT@&t@_CLEANUP ]]) mkdir sub AT_DATA_M4SUGAR([sub/"two spaces".at], -[[AT_SETUP([test two]) -AT_CHECK([test "]m4_dquote(AT_LINE)[" = "two spaces.at:2"]) -AT_CLEANUP +[[AT@&t@_SETUP([test two]) +AT@&t@_CHECK([test "]m4_dquote(AT@&t@_LINE)[" = "two spaces.at:2"]) +AT@&t@_CLEANUP ]]) AT_CHECK_AT_PREP([suite], -- 2.47.2