From: Akim Demaille Date: Mon, 20 Aug 2001 14:45:09 +0000 (+0000) Subject: * tests/base.at, tests/m4sh.at, tests/m4sugar.at, X-Git-Tag: AUTOCONF-2.52d~72 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2ffdce9940636bb08f7952e18f16d933363c016b;p=thirdparty%2Fautoconf.git * tests/base.at, tests/m4sh.at, tests/m4sugar.at, * tests/semantics.at, tests/tools.at, tests/torture.at: s/^AT_DATA(([^][]+),/AT_DATA([$1],/. --- diff --git a/ChangeLog b/ChangeLog index d0f608ec9..80095554e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2001-08-20 Akim Demaille + + * tests/base.at, tests/m4sh.at, tests/m4sugar.at, + * tests/semantics.at, tests/tools.at, tests/torture.at: + s/^AT_DATA\(([^][]+),/AT_DATA([$1],/. + + 2001-08-20 Akim Demaille Autotest invokes M4sh's initialization. diff --git a/tests/base.at b/tests/base.at index 89684349a..d7ef17460 100644 --- a/tests/base.at +++ b/tests/base.at @@ -28,7 +28,7 @@ AT_BANNER([Autoconf base layer.]) AT_SETUP([AC_REQUIRE: topological sort]) -AT_DATA(configure.ac, +AT_DATA([configure.ac], [[define([REQUIRE_AND_CHECK], [AC_REQUIRE([$1]) test -z "$m4@__@_translit([$1], [A-Z], [a-z])" && AS_EXIT(1)]) diff --git a/tests/m4sh.at b/tests/m4sh.at index c70f46a4a..e068126b5 100644 --- a/tests/m4sh.at +++ b/tests/m4sh.at @@ -30,7 +30,7 @@ m4_pattern_allow([^AS_EXIT$]) m4_pattern_allow([^AS_DIRNAME(_SED)?$]) AT_SETUP([[AS_DIRNAME & AS_DIRNAME_SED]]) -AT_DATA(configure.ac, +AT_DATA([configure.ac], [[AC_PLAIN_SCRIPT() #! /bin/sh diff --git a/tests/m4sugar.at b/tests/m4sugar.at index 9bc62c37e..c36a19d52 100644 --- a/tests/m4sugar.at +++ b/tests/m4sugar.at @@ -135,7 +135,7 @@ m4_text_wrap([Super long documentation.], [ ], [ --too-wide], 30) m4_text_wrap([First, second , third, [,quoted]]) ]]) -AT_DATA(expout, +AT_DATA([expout], [[/* Short string */ /* Much longer diff --git a/tests/semantics.at b/tests/semantics.at index 105e3efcf..174a54373 100644 --- a/tests/semantics.at +++ b/tests/semantics.at @@ -202,7 +202,7 @@ AT_CHECK_MACRO([AC_CHECK_TYPES], # or to the new one. AT_SETUP([AC_CHECK_TYPES: backward compatibility]) -AT_DATA(configure.ac, +AT_DATA([configure.ac], [[AC_INIT define([_AC_CHECK_TYPE_NEW], [NEW]) define([_AC_CHECK_TYPE_OLD], [OLD]) @@ -283,7 +283,7 @@ AT_SETUP([AC_CHECK_PROG & AC_CHECK_PROGS]) AT_CHECK_PROGS_PREPARE -AT_DATA(configure.ac, +AT_DATA([configure.ac], [[AC_INIT pwd=`pwd` p="1${ac_path_separator}2${ac_path_separator}3${ac_path_separator}4${ac_path_separator}5${ac_path_separator}6" @@ -365,7 +365,7 @@ AT_SETUP(AC_PATH_PROG & AC_PATH_PROGS) AT_CHECK_PROGS_PREPARE -AT_DATA(configure.ac, +AT_DATA([configure.ac], [[AC_INIT pwd=`pwd` p="1${ac_path_separator}2${ac_path_separator}3${ac_path_separator}4${ac_path_separator}5${ac_path_separator}6" diff --git a/tests/tools.at b/tests/tools.at index 45d0b1fde..4fa306009 100644 --- a/tests/tools.at +++ b/tests/tools.at @@ -49,7 +49,7 @@ AT_SETUP([Syntax of the shell scripts]) # A script that never returns. We don't care that it never returns, # broken /bin/sh loop equally with `false', but it makes it easier to # test the robusteness in a good environment: just remove the `-n'. -AT_DATA(endless.sh, +AT_DATA([endless.sh], [[while : do : @@ -57,7 +57,7 @@ done ]]) # A script in charge of testing `/bin/sh -n'. -AT_DATA(syntax.sh, +AT_DATA([syntax.sh], [[(/bin/sh -n endless.sh) & sleep 2 if kill $! >/dev/null 2>&1; then @@ -134,7 +134,7 @@ AT_CLEANUP AT_SETUP([autoconf --trace: user macros]) m4_pattern_allow([^m4_(define|shift)$]) -AT_DATA(configure.ac, +AT_DATA([configure.ac], [[m4_define([active], [ACTIVE]) m4_define([TRACE1], [TRACE2(m4_shift($@))]) m4_define([TRACE2], [[$2], $1]) @@ -221,7 +221,7 @@ AT_CLEANUP # -------------------------- AT_SETUP([autoconf --trace: builtins]) -AT_DATA(configure.ac, +AT_DATA([configure.ac], [[define([active], [ACTIVE]) ]]) @@ -377,14 +377,14 @@ AT_CLEANUP AT_SETUP([autoheader]) -AT_DATA(acconfig.h, +AT_DATA([acconfig.h], [[/* Define this to whatever you want. */ #undef this ]]) # 1. Check that `acconfig.h' is still honored. -AT_DATA(configure.ac, +AT_DATA([configure.ac], [[AC_INIT AC_CONFIG_HEADERS(config.h) AC_DEFINE(this, "whatever you want.") @@ -398,7 +398,7 @@ AT_CHECK([autoheader --autoconf-dir ../lib -input @@ -191,7 +191,7 @@ AT_CLEANUP(header file link commandvar-header var-file var-link var-command # Check that config.status detects missing input files AT_SETUP([Missing templates]) -AT_DATA(configure.ac, +AT_DATA([configure.ac], [[AC_INIT AC_CONFIG_FILES([nonexistent]) AC_OUTPUT @@ -222,7 +222,7 @@ AT_CLEANUP AT_SETUP([configure invocation]) -AT_DATA(configure.ac, +AT_DATA([configure.ac], [[AC_INIT echo "result=$one$enable_two$with_three" AC_OUTPUT @@ -424,7 +424,7 @@ AT_CHECK_AUTOHEADER AT_CHECK_CONFIGURE # Checking that AC_DEFINE worked properly. -AT_DATA(expout, +AT_DATA([expout], [m4_for(AT_Count, 1, 100, 1, [ /* AT_DESCRIPTION */ @@ -433,7 +433,7 @@ AT_DATA(expout, AT_CHECK([sed -n '3,$ p' config.h], 0, expout) # Checking that AC_SUBST worked properly. -AT_DATA(expout, +AT_DATA([expout], [m4_for(AT_Count, 1, 100, 1, [AT_BIG_VALUE ])])