mirror/autoconf
2
0
Fork 0
mirror of git://git.sv.gnu.org/autoconf synced 2024-12-03 02:00:36 +08:00
Code Issues Packages Projects Releases Wiki Activity
22d6c214ea
autoconf/tests/m4sugar.at

156 lines
3.5 KiB
Plaintext
Raw Normal View History

Move the Autoconf independent shell macros into the file `shell.m4' and the name space `AS_*'. * acgeneral.m4 (AC_SHELL_IFELSE, _AC_SHELL_TMPDIR, AC_SHELL_UNSET) (AC_SHELL_MKDIR_P, AC_SHELL_DIRNAME): Rename and move to... * shell.m4 (AS_IFELSE, AS_TMPDIR, AS_UNSET, AS_MKDIR_P) (AS_DIRNAME): here, a new file. Adjust all dependencies. * tests/base.m4 (m4_wrap): Eve out into... * tests/shell.m4: here, new file. * tests/base.m4 (AC_SHELL_MKDIR_P) (AC_SHELL_DIRNAME & AC_SHELL_DIRNAME_SED): Eve out into... * tests/m4sugar.m4 (AS_MKDIR_P, AS_DIRNAME & AS_DIRNAME_SED): here, new file. Adjust the test suite.
2000-10-26 01:51:10 +08:00
# -*- Autoconf -*-
Provide a means to display banners in the test suite. * tests/atgeneral.m4 (AT_INIT): Initialize AT_banner_ordinal. Execute the epilogue of the tests only if a test was run. Don't built the value of `at_tests_all' by a for loop: expand AT_TESTS_ALL. (AT_SETUP): Build AT_TESTS_ALL. (AT_BANNER): New. Adjust all the former banners to use it. (AT_CHECK): Don't trace the decoding of $?.
2000-11-29 18:12:05 +08:00
AT_BANNER([M4sugar.])
Move the Autoconf independent shell macros into the file `shell.m4' and the name space `AS_*'. * acgeneral.m4 (AC_SHELL_IFELSE, _AC_SHELL_TMPDIR, AC_SHELL_UNSET) (AC_SHELL_MKDIR_P, AC_SHELL_DIRNAME): Rename and move to... * shell.m4 (AS_IFELSE, AS_TMPDIR, AS_UNSET, AS_MKDIR_P) (AS_DIRNAME): here, a new file. Adjust all dependencies. * tests/base.m4 (m4_wrap): Eve out into... * tests/shell.m4: here, new file. * tests/base.m4 (AC_SHELL_MKDIR_P) (AC_SHELL_DIRNAME & AC_SHELL_DIRNAME_SED): Eve out into... * tests/m4sugar.m4 (AS_MKDIR_P, AS_DIRNAME & AS_DIRNAME_SED): here, new file. Adjust the test suite.
2000-10-26 01:51:10 +08:00
* AUTHORS, BUGS, ChangeLog, ChangeLog.0, ChangeLog.1, ChangeLog.2, GNUmakefile, Makefile.maint, NEWS, README, README-alpha, TODO, configure.ac, lib/autoconf/Makefile.am, m4/atconfig.m4, m4/init.m4, m4/m4.m4, m4/missing.m4, m4/sanity.m4, tests/README, tests/aclocal.m4, tests/atspecific.m4, tests/base.at, tests/compile.at, tests/foreign.at, tests/m4sh.at, tests/m4sugar.at, tests/semantics.at, tests/suite.at, tests/tools.at, tests/torture.at: Add copyright notice. * tests/mktests.sh: Update year in copyright notice.
2001-08-12 21:05:11 +08:00
# Copyright 2000, 2001 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA.
* m4sugar.m4 (m4_undefine, m4_popdef): Don't tolerate undefined arguments. (_m4_expansion_stack): Rename as... (m4_expansion_stack): this, and change its value: instead of using the pushdef stack to stack each *line* of the stack, each definition contains the whole stack. I.e., to display the whole stack, instead of popdefing and displaying each definition, just display the current definition. (m4_expansion_stack_push, m4_expansion_stack_pop): New. * tests/atspecific.m4 (AT_CHECK_AUTOCONF): Let $2 be the expected exit status. * tests/m4sugar.m4 (m4_require: circular dependencies): New test.
2001-01-17 23:26:42 +08:00
# Order of the tests:
# - m4_warn
#
# - m4_require
# uses warn/error code.
#
# - m4_text_wrap
## --------- ##
## m4_warn. ##
## --------- ##
AT_SETUP([[m4_warn]])
# m4_text_wrap is used to display the help strings. Also, check that
# commas are not swallowed. This can easily happen because of
# m4-listification.
* bin/autom4te.in (@m4_warning): New. (&handle_m4): Use it. * tests/m4sugar.at (m4_warn): Pass `-f' to autom4te to ensure the warnings are issued at each run. * tests/atspecific.m4 (AT_CHECK_M4SUGAR, AT_CHECK_M4SH): M4sugar is in the src tree.
2001-08-15 15:49:59 +08:00
# FIXME: For the time being we use -f to make sure we do issue the
# warnings. But maybe autom4te should handle that by itself?
The use of `dumpstat' revealed that `len' was used although it should not. m4_text_wrap was using it, but in the Autoconf world where it is legal. Hence (i) test M4sh in its own world, not Autoconf's, and (ii), ahem, fix the bug :) * lib/autotest/general.m4: Be sure the set good quotes, as tracing does not like `' instead of []. (AT_INIT): Forbid `^_?AT_'. And don't output such tokens. * tests/Makefile.am (CLEANFILES): Add `script', `script.s4g', `script.as', and `autom4te.cache'. Remove `empty' and `macro' which are no longer used. * tests/atspecific.m4 (AT_CHECK_M4SUGAR, AT_CHECK_M4SH): New. * tests/m4sugar.at: Use it. * lib/m4sugar/m4sugar.m4: Use `m4_len' not `len'.
2001-08-07 15:56:40 +08:00
AT_DATA([script.s4g],
* m4sugar.m4 (m4_undefine, m4_popdef): Don't tolerate undefined arguments. (_m4_expansion_stack): Rename as... (m4_expansion_stack): this, and change its value: instead of using the pushdef stack to stack each *line* of the stack, each definition contains the whole stack. I.e., to display the whole stack, instead of popdefing and displaying each definition, just display the current definition. (m4_expansion_stack_push, m4_expansion_stack_pop): New. * tests/atspecific.m4 (AT_CHECK_AUTOCONF): Let $2 be the expected exit status. * tests/m4sugar.m4 (m4_require: circular dependencies): New test.
2001-01-17 23:26:42 +08:00
[[m4_warn([foo], [foo])
m4_warn([bar], [bar])
m4_warn([syntax], [syntax])
]])
The use of `dumpstat' revealed that `len' was used although it should not. m4_text_wrap was using it, but in the Autoconf world where it is legal. Hence (i) test M4sh in its own world, not Autoconf's, and (ii), ahem, fix the bug :) * lib/autotest/general.m4: Be sure the set good quotes, as tracing does not like `' instead of []. (AT_INIT): Forbid `^_?AT_'. And don't output such tokens. * tests/Makefile.am (CLEANFILES): Add `script', `script.s4g', `script.as', and `autom4te.cache'. Remove `empty' and `macro' which are no longer used. * tests/atspecific.m4 (AT_CHECK_M4SUGAR, AT_CHECK_M4SH): New. * tests/m4sugar.at: Use it. * lib/m4sugar/m4sugar.m4: Use `m4_len' not `len'.
2001-08-07 15:56:40 +08:00
AT_CHECK_M4SUGAR([-o-], 0, [],
[script.s4g:3: warning: syntax
* m4sugar.m4 (m4_undefine, m4_popdef): Don't tolerate undefined arguments. (_m4_expansion_stack): Rename as... (m4_expansion_stack): this, and change its value: instead of using the pushdef stack to stack each *line* of the stack, each definition contains the whole stack. I.e., to display the whole stack, instead of popdefing and displaying each definition, just display the current definition. (m4_expansion_stack_push, m4_expansion_stack_pop): New. * tests/atspecific.m4 (AT_CHECK_AUTOCONF): Let $2 be the expected exit status. * tests/m4sugar.m4 (m4_require: circular dependencies): New test.
2001-01-17 23:26:42 +08:00
])
* bin/autom4te.in (@m4_warning): New. (&handle_m4): Use it. * tests/m4sugar.at (m4_warn): Pass `-f' to autom4te to ensure the warnings are issued at each run. * tests/atspecific.m4 (AT_CHECK_M4SUGAR, AT_CHECK_M4SH): M4sugar is in the src tree.
2001-08-15 15:49:59 +08:00
AT_CHECK_M4SUGAR([-o- -Wall -f], 0, [],
The use of `dumpstat' revealed that `len' was used although it should not. m4_text_wrap was using it, but in the Autoconf world where it is legal. Hence (i) test M4sh in its own world, not Autoconf's, and (ii), ahem, fix the bug :) * lib/autotest/general.m4: Be sure the set good quotes, as tracing does not like `' instead of []. (AT_INIT): Forbid `^_?AT_'. And don't output such tokens. * tests/Makefile.am (CLEANFILES): Add `script', `script.s4g', `script.as', and `autom4te.cache'. Remove `empty' and `macro' which are no longer used. * tests/atspecific.m4 (AT_CHECK_M4SUGAR, AT_CHECK_M4SH): New. * tests/m4sugar.at: Use it. * lib/m4sugar/m4sugar.m4: Use `m4_len' not `len'.
2001-08-07 15:56:40 +08:00
[script.s4g:1: warning: foo
script.s4g:2: warning: bar
script.s4g:3: warning: syntax
* m4sugar.m4 (m4_undefine, m4_popdef): Don't tolerate undefined arguments. (_m4_expansion_stack): Rename as... (m4_expansion_stack): this, and change its value: instead of using the pushdef stack to stack each *line* of the stack, each definition contains the whole stack. I.e., to display the whole stack, instead of popdefing and displaying each definition, just display the current definition. (m4_expansion_stack_push, m4_expansion_stack_pop): New. * tests/atspecific.m4 (AT_CHECK_AUTOCONF): Let $2 be the expected exit status. * tests/m4sugar.m4 (m4_require: circular dependencies): New test.
2001-01-17 23:26:42 +08:00
])
* bin/autom4te.in (@m4_warning): New. (&handle_m4): Use it. * tests/m4sugar.at (m4_warn): Pass `-f' to autom4te to ensure the warnings are issued at each run. * tests/atspecific.m4 (AT_CHECK_M4SUGAR, AT_CHECK_M4SH): M4sugar is in the src tree.
2001-08-15 15:49:59 +08:00
AT_CHECK_M4SUGAR([-o- -Wnone,bar -f], 0, [],
The use of `dumpstat' revealed that `len' was used although it should not. m4_text_wrap was using it, but in the Autoconf world where it is legal. Hence (i) test M4sh in its own world, not Autoconf's, and (ii), ahem, fix the bug :) * lib/autotest/general.m4: Be sure the set good quotes, as tracing does not like `' instead of []. (AT_INIT): Forbid `^_?AT_'. And don't output such tokens. * tests/Makefile.am (CLEANFILES): Add `script', `script.s4g', `script.as', and `autom4te.cache'. Remove `empty' and `macro' which are no longer used. * tests/atspecific.m4 (AT_CHECK_M4SUGAR, AT_CHECK_M4SH): New. * tests/m4sugar.at: Use it. * lib/m4sugar/m4sugar.m4: Use `m4_len' not `len'.
2001-08-07 15:56:40 +08:00
[script.s4g:2: warning: bar
* m4sugar.m4 (m4_undefine, m4_popdef): Don't tolerate undefined arguments. (_m4_expansion_stack): Rename as... (m4_expansion_stack): this, and change its value: instead of using the pushdef stack to stack each *line* of the stack, each definition contains the whole stack. I.e., to display the whole stack, instead of popdefing and displaying each definition, just display the current definition. (m4_expansion_stack_push, m4_expansion_stack_pop): New. * tests/atspecific.m4 (AT_CHECK_AUTOCONF): Let $2 be the expected exit status. * tests/m4sugar.m4 (m4_require: circular dependencies): New test.
2001-01-17 23:26:42 +08:00
])
* bin/autom4te.in (@m4_warning): New. (&handle_m4): Use it. * tests/m4sugar.at (m4_warn): Pass `-f' to autom4te to ensure the warnings are issued at each run. * tests/atspecific.m4 (AT_CHECK_M4SUGAR, AT_CHECK_M4SH): M4sugar is in the src tree.
2001-08-15 15:49:59 +08:00
AT_CHECK_M4SUGAR([-o- -Wnone,bar,error -f], 1, [],
The use of `dumpstat' revealed that `len' was used although it should not. m4_text_wrap was using it, but in the Autoconf world where it is legal. Hence (i) test M4sh in its own world, not Autoconf's, and (ii), ahem, fix the bug :) * lib/autotest/general.m4: Be sure the set good quotes, as tracing does not like `' instead of []. (AT_INIT): Forbid `^_?AT_'. And don't output such tokens. * tests/Makefile.am (CLEANFILES): Add `script', `script.s4g', `script.as', and `autom4te.cache'. Remove `empty' and `macro' which are no longer used. * tests/atspecific.m4 (AT_CHECK_M4SUGAR, AT_CHECK_M4SH): New. * tests/m4sugar.at: Use it. * lib/m4sugar/m4sugar.m4: Use `m4_len' not `len'.
2001-08-07 15:56:40 +08:00
[script.s4g:2: error: bar
script.s4g:2: the top level
* m4sugar.m4 (m4_undefine, m4_popdef): Don't tolerate undefined arguments. (_m4_expansion_stack): Rename as... (m4_expansion_stack): this, and change its value: instead of using the pushdef stack to stack each *line* of the stack, each definition contains the whole stack. I.e., to display the whole stack, instead of popdefing and displaying each definition, just display the current definition. (m4_expansion_stack_push, m4_expansion_stack_pop): New. * tests/atspecific.m4 (AT_CHECK_AUTOCONF): Let $2 be the expected exit status. * tests/m4sugar.m4 (m4_require: circular dependencies): New test.
2001-01-17 23:26:42 +08:00
])
AT_CLEANUP
## ----------------------------------- ##
## m4_require: circular dependencies. ##
## ----------------------------------- ##
AT_SETUP([[m4_require: circular dependencies]])
# m4_text_wrap is used to display the help strings. Also, check that
# commas are not swallowed. This can easily happen because of
# m4-listification.
The use of `dumpstat' revealed that `len' was used although it should not. m4_text_wrap was using it, but in the Autoconf world where it is legal. Hence (i) test M4sh in its own world, not Autoconf's, and (ii), ahem, fix the bug :) * lib/autotest/general.m4: Be sure the set good quotes, as tracing does not like `' instead of []. (AT_INIT): Forbid `^_?AT_'. And don't output such tokens. * tests/Makefile.am (CLEANFILES): Add `script', `script.s4g', `script.as', and `autom4te.cache'. Remove `empty' and `macro' which are no longer used. * tests/atspecific.m4 (AT_CHECK_M4SUGAR, AT_CHECK_M4SH): New. * tests/m4sugar.at: Use it. * lib/m4sugar/m4sugar.m4: Use `m4_len' not `len'.
2001-08-07 15:56:40 +08:00
AT_DATA([script.s4g],
* m4sugar.m4 (m4_undefine, m4_popdef): Don't tolerate undefined arguments. (_m4_expansion_stack): Rename as... (m4_expansion_stack): this, and change its value: instead of using the pushdef stack to stack each *line* of the stack, each definition contains the whole stack. I.e., to display the whole stack, instead of popdefing and displaying each definition, just display the current definition. (m4_expansion_stack_push, m4_expansion_stack_pop): New. * tests/atspecific.m4 (AT_CHECK_AUTOCONF): Let $2 be the expected exit status. * tests/m4sugar.m4 (m4_require: circular dependencies): New test.
2001-01-17 23:26:42 +08:00
[[m4_defun([foo],
[m4_require([bar])])
m4_defun([bar],
[m4_require([foo])])
m4_defun([baz],
[m4_require([foo])])
Require a perfect divert push/pop balance. * m4sugar.m4 (m4_divert, m4_divert_push, m4_divert_pop): Keep track of them in m4_divert_stack. (m4_divert_pop): Accept the expected current diversion as argument and m4_fatal if incorrect, or if there is nothing to pop. (globally): Specify the known m4_divert_pop. Preserve symbolic values when possible. * acgeneral.m4: No longer push the first diversion. Specify the known m4_divert_pop. (AC_PLAIN_SCRIPT): When m4_divert_push a diversion, m4_wrap its pop. (AC_INIT): Run AC_PLAIN_SCRIPT first, not last. * tests/m4sh.at (AS_DIRNAME & AS_DIRNAME_SED): Can't use m4_defun without m4_init. * m4sugar.m4: Likewise.
2001-01-18 17:16:08 +08:00
m4_init
* m4sugar.m4 (m4_undefine, m4_popdef): Don't tolerate undefined arguments. (_m4_expansion_stack): Rename as... (m4_expansion_stack): this, and change its value: instead of using the pushdef stack to stack each *line* of the stack, each definition contains the whole stack. I.e., to display the whole stack, instead of popdefing and displaying each definition, just display the current definition. (m4_expansion_stack_push, m4_expansion_stack_pop): New. * tests/atspecific.m4 (AT_CHECK_AUTOCONF): Let $2 be the expected exit status. * tests/m4sugar.m4 (m4_require: circular dependencies): New test.
2001-01-17 23:26:42 +08:00
baz
]])
The use of `dumpstat' revealed that `len' was used although it should not. m4_text_wrap was using it, but in the Autoconf world where it is legal. Hence (i) test M4sh in its own world, not Autoconf's, and (ii), ahem, fix the bug :) * lib/autotest/general.m4: Be sure the set good quotes, as tracing does not like `' instead of []. (AT_INIT): Forbid `^_?AT_'. And don't output such tokens. * tests/Makefile.am (CLEANFILES): Add `script', `script.s4g', `script.as', and `autom4te.cache'. Remove `empty' and `macro' which are no longer used. * tests/atspecific.m4 (AT_CHECK_M4SUGAR, AT_CHECK_M4SH): New. * tests/m4sugar.at: Use it. * lib/m4sugar/m4sugar.m4: Use `m4_len' not `len'.
2001-08-07 15:56:40 +08:00
AT_CHECK_M4SUGAR([], 1, [],
[[script.s4g:11: error: m4_require: circular dependency of foo
script.s4g:11: foo is required by...
script.s4g:5: bar is expanded from...
script.s4g:11: bar is required by...
script.s4g:2: foo is expanded from...
script.s4g:11: foo is required by...
script.s4g:8: baz is expanded from...
script.s4g:11: the top level
* m4sugar.m4 (m4_undefine, m4_popdef): Don't tolerate undefined arguments. (_m4_expansion_stack): Rename as... (m4_expansion_stack): this, and change its value: instead of using the pushdef stack to stack each *line* of the stack, each definition contains the whole stack. I.e., to display the whole stack, instead of popdefing and displaying each definition, just display the current definition. (m4_expansion_stack_push, m4_expansion_stack_pop): New. * tests/atspecific.m4 (AT_CHECK_AUTOCONF): Let $2 be the expected exit status. * tests/m4sugar.m4 (m4_require: circular dependencies): New test.
2001-01-17 23:26:42 +08:00
]])
AT_CLEANUP
* m4sugar.m4 (m4_rename_m4, m4_copy_unm4): New macros. Use them. (debugfile, debugmode, m4exit, m4wrap, maketemp, patsubst, regexp) (substr, translit, m4_wrap): Rename as... (m4_debugfile, m4_debugmode, m4_exit, m4_wrap, m4_maketemp) (m4_patsubst, m4_regexp, m4_substr, m4_translit, m4_text_wrap): these. Adjust all dependencies. * acgeneral.m4: Adjust. * tests/m4sugar.at: Adjust. * autoconf.m4 (m4exit, patsubst, regexp, substr, translit): Reestablish them.
2000-11-03 16:53:26 +08:00
## -------------- ##
## m4_text_wrap. ##
## -------------- ##
Move the Autoconf independent shell macros into the file `shell.m4' and the name space `AS_*'. * acgeneral.m4 (AC_SHELL_IFELSE, _AC_SHELL_TMPDIR, AC_SHELL_UNSET) (AC_SHELL_MKDIR_P, AC_SHELL_DIRNAME): Rename and move to... * shell.m4 (AS_IFELSE, AS_TMPDIR, AS_UNSET, AS_MKDIR_P) (AS_DIRNAME): here, a new file. Adjust all dependencies. * tests/base.m4 (m4_wrap): Eve out into... * tests/shell.m4: here, new file. * tests/base.m4 (AC_SHELL_MKDIR_P) (AC_SHELL_DIRNAME & AC_SHELL_DIRNAME_SED): Eve out into... * tests/m4sugar.m4 (AS_MKDIR_P, AS_DIRNAME & AS_DIRNAME_SED): here, new file. Adjust the test suite.
2000-10-26 01:51:10 +08:00
Move Autotest on top of M4sh. * tests/atgeneral.m4: Import M4sh. Adjust the differences on the names of the builtins (define etc.). (AT_CASE): Remove, use m4_case. (AT_SETUP): Don't use `AT_group_description', `$1' is OK. * tests/atspecific.m4 (m4_for, m4_foreach): Remove, use those of M4sugar. * tests/m4sugar.at: Strengthen the quotation and adjust to the new macro names. * tests/m4sh.at: Ditto. * tests/torture.at: Ditto. * tests/base.at: Ditto. * m4sh.m4: Import M4sugar. * autoconf.m4: Don't import M4sugar, M4sh does.
2000-11-23 17:45:48 +08:00
AT_SETUP([[m4_text_wrap]])
Move the Autoconf independent shell macros into the file `shell.m4' and the name space `AS_*'. * acgeneral.m4 (AC_SHELL_IFELSE, _AC_SHELL_TMPDIR, AC_SHELL_UNSET) (AC_SHELL_MKDIR_P, AC_SHELL_DIRNAME): Rename and move to... * shell.m4 (AS_IFELSE, AS_TMPDIR, AS_UNSET, AS_MKDIR_P) (AS_DIRNAME): here, a new file. Adjust all dependencies. * tests/base.m4 (m4_wrap): Eve out into... * tests/shell.m4: here, new file. * tests/base.m4 (AC_SHELL_MKDIR_P) (AC_SHELL_DIRNAME & AC_SHELL_DIRNAME_SED): Eve out into... * tests/m4sugar.m4 (AS_MKDIR_P, AS_DIRNAME & AS_DIRNAME_SED): here, new file. Adjust the test suite.
2000-10-26 01:51:10 +08:00
* m4sugar.m4 (m4_rename_m4, m4_copy_unm4): New macros. Use them. (debugfile, debugmode, m4exit, m4wrap, maketemp, patsubst, regexp) (substr, translit, m4_wrap): Rename as... (m4_debugfile, m4_debugmode, m4_exit, m4_wrap, m4_maketemp) (m4_patsubst, m4_regexp, m4_substr, m4_translit, m4_text_wrap): these. Adjust all dependencies. * acgeneral.m4: Adjust. * tests/m4sugar.at: Adjust. * autoconf.m4 (m4exit, patsubst, regexp, substr, translit): Reestablish them.
2000-11-03 16:53:26 +08:00
# m4_text_wrap is used to display the help strings. Also, check that
Move the Autoconf independent shell macros into the file `shell.m4' and the name space `AS_*'. * acgeneral.m4 (AC_SHELL_IFELSE, _AC_SHELL_TMPDIR, AC_SHELL_UNSET) (AC_SHELL_MKDIR_P, AC_SHELL_DIRNAME): Rename and move to... * shell.m4 (AS_IFELSE, AS_TMPDIR, AS_UNSET, AS_MKDIR_P) (AS_DIRNAME): here, a new file. Adjust all dependencies. * tests/base.m4 (m4_wrap): Eve out into... * tests/shell.m4: here, new file. * tests/base.m4 (AC_SHELL_MKDIR_P) (AC_SHELL_DIRNAME & AC_SHELL_DIRNAME_SED): Eve out into... * tests/m4sugar.m4 (AS_MKDIR_P, AS_DIRNAME & AS_DIRNAME_SED): here, new file. Adjust the test suite.
2000-10-26 01:51:10 +08:00
# commas are not swallowed. This can easily happen because of
# m4-listification.
The use of `dumpstat' revealed that `len' was used although it should not. m4_text_wrap was using it, but in the Autoconf world where it is legal. Hence (i) test M4sh in its own world, not Autoconf's, and (ii), ahem, fix the bug :) * lib/autotest/general.m4: Be sure the set good quotes, as tracing does not like `' instead of []. (AT_INIT): Forbid `^_?AT_'. And don't output such tokens. * tests/Makefile.am (CLEANFILES): Add `script', `script.s4g', `script.as', and `autom4te.cache'. Remove `empty' and `macro' which are no longer used. * tests/atspecific.m4 (AT_CHECK_M4SUGAR, AT_CHECK_M4SH): New. * tests/m4sugar.at: Use it. * lib/m4sugar/m4sugar.m4: Use `m4_len' not `len'.
2001-08-07 15:56:40 +08:00
AT_DATA([script.s4g],
[[m4_divert_push([0])m4_wrap([m4_divert_pop([0])])dnl
* m4sugar.m4 (m4_rename_m4, m4_copy_unm4): New macros. Use them. (debugfile, debugmode, m4exit, m4wrap, maketemp, patsubst, regexp) (substr, translit, m4_wrap): Rename as... (m4_debugfile, m4_debugmode, m4_exit, m4_wrap, m4_maketemp) (m4_patsubst, m4_regexp, m4_substr, m4_translit, m4_text_wrap): these. Adjust all dependencies. * acgeneral.m4: Adjust. * tests/m4sugar.at: Adjust. * autoconf.m4 (m4exit, patsubst, regexp, substr, translit): Reestablish them.
2000-11-03 16:53:26 +08:00
m4_text_wrap([Short string */], [ ], [/* ], 20)
Move the Autoconf independent shell macros into the file `shell.m4' and the name space `AS_*'. * acgeneral.m4 (AC_SHELL_IFELSE, _AC_SHELL_TMPDIR, AC_SHELL_UNSET) (AC_SHELL_MKDIR_P, AC_SHELL_DIRNAME): Rename and move to... * shell.m4 (AS_IFELSE, AS_TMPDIR, AS_UNSET, AS_MKDIR_P) (AS_DIRNAME): here, a new file. Adjust all dependencies. * tests/base.m4 (m4_wrap): Eve out into... * tests/shell.m4: here, new file. * tests/base.m4 (AC_SHELL_MKDIR_P) (AC_SHELL_DIRNAME & AC_SHELL_DIRNAME_SED): Eve out into... * tests/m4sugar.m4 (AS_MKDIR_P, AS_DIRNAME & AS_DIRNAME_SED): here, new file. Adjust the test suite.
2000-10-26 01:51:10 +08:00
* m4sugar.m4 (m4_rename_m4, m4_copy_unm4): New macros. Use them. (debugfile, debugmode, m4exit, m4wrap, maketemp, patsubst, regexp) (substr, translit, m4_wrap): Rename as... (m4_debugfile, m4_debugmode, m4_exit, m4_wrap, m4_maketemp) (m4_patsubst, m4_regexp, m4_substr, m4_translit, m4_text_wrap): these. Adjust all dependencies. * acgeneral.m4: Adjust. * tests/m4sugar.at: Adjust. * autoconf.m4 (m4exit, patsubst, regexp, substr, translit): Reestablish them.
2000-11-03 16:53:26 +08:00
m4_text_wrap([Much longer string */], [ ], [/* ], 20)
Move the Autoconf independent shell macros into the file `shell.m4' and the name space `AS_*'. * acgeneral.m4 (AC_SHELL_IFELSE, _AC_SHELL_TMPDIR, AC_SHELL_UNSET) (AC_SHELL_MKDIR_P, AC_SHELL_DIRNAME): Rename and move to... * shell.m4 (AS_IFELSE, AS_TMPDIR, AS_UNSET, AS_MKDIR_P) (AS_DIRNAME): here, a new file. Adjust all dependencies. * tests/base.m4 (m4_wrap): Eve out into... * tests/shell.m4: here, new file. * tests/base.m4 (AC_SHELL_MKDIR_P) (AC_SHELL_DIRNAME & AC_SHELL_DIRNAME_SED): Eve out into... * tests/m4sugar.m4 (AS_MKDIR_P, AS_DIRNAME & AS_DIRNAME_SED): here, new file. Adjust the test suite.
2000-10-26 01:51:10 +08:00
* m4sugar.m4 (m4_rename_m4, m4_copy_unm4): New macros. Use them. (debugfile, debugmode, m4exit, m4wrap, maketemp, patsubst, regexp) (substr, translit, m4_wrap): Rename as... (m4_debugfile, m4_debugmode, m4_exit, m4_wrap, m4_maketemp) (m4_patsubst, m4_regexp, m4_substr, m4_translit, m4_text_wrap): these. Adjust all dependencies. * acgeneral.m4: Adjust. * tests/m4sugar.at: Adjust. * autoconf.m4 (m4exit, patsubst, regexp, substr, translit): Reestablish them.
2000-11-03 16:53:26 +08:00
m4_text_wrap([Short doc.], [ ], [ --short ], 30)
Move the Autoconf independent shell macros into the file `shell.m4' and the name space `AS_*'. * acgeneral.m4 (AC_SHELL_IFELSE, _AC_SHELL_TMPDIR, AC_SHELL_UNSET) (AC_SHELL_MKDIR_P, AC_SHELL_DIRNAME): Rename and move to... * shell.m4 (AS_IFELSE, AS_TMPDIR, AS_UNSET, AS_MKDIR_P) (AS_DIRNAME): here, a new file. Adjust all dependencies. * tests/base.m4 (m4_wrap): Eve out into... * tests/shell.m4: here, new file. * tests/base.m4 (AC_SHELL_MKDIR_P) (AC_SHELL_DIRNAME & AC_SHELL_DIRNAME_SED): Eve out into... * tests/m4sugar.m4 (AS_MKDIR_P, AS_DIRNAME & AS_DIRNAME_SED): here, new file. Adjust the test suite.
2000-10-26 01:51:10 +08:00
* m4sugar.m4 (m4_rename_m4, m4_copy_unm4): New macros. Use them. (debugfile, debugmode, m4exit, m4wrap, maketemp, patsubst, regexp) (substr, translit, m4_wrap): Rename as... (m4_debugfile, m4_debugmode, m4_exit, m4_wrap, m4_maketemp) (m4_patsubst, m4_regexp, m4_substr, m4_translit, m4_text_wrap): these. Adjust all dependencies. * acgeneral.m4: Adjust. * tests/m4sugar.at: Adjust. * autoconf.m4 (m4exit, patsubst, regexp, substr, translit): Reestablish them.
2000-11-03 16:53:26 +08:00
m4_text_wrap([Short doc.], [ ], [ --too-wide], 30)
Move the Autoconf independent shell macros into the file `shell.m4' and the name space `AS_*'. * acgeneral.m4 (AC_SHELL_IFELSE, _AC_SHELL_TMPDIR, AC_SHELL_UNSET) (AC_SHELL_MKDIR_P, AC_SHELL_DIRNAME): Rename and move to... * shell.m4 (AS_IFELSE, AS_TMPDIR, AS_UNSET, AS_MKDIR_P) (AS_DIRNAME): here, a new file. Adjust all dependencies. * tests/base.m4 (m4_wrap): Eve out into... * tests/shell.m4: here, new file. * tests/base.m4 (AC_SHELL_MKDIR_P) (AC_SHELL_DIRNAME & AC_SHELL_DIRNAME_SED): Eve out into... * tests/m4sugar.m4 (AS_MKDIR_P, AS_DIRNAME & AS_DIRNAME_SED): here, new file. Adjust the test suite.
2000-10-26 01:51:10 +08:00
* m4sugar.m4 (m4_rename_m4, m4_copy_unm4): New macros. Use them. (debugfile, debugmode, m4exit, m4wrap, maketemp, patsubst, regexp) (substr, translit, m4_wrap): Rename as... (m4_debugfile, m4_debugmode, m4_exit, m4_wrap, m4_maketemp) (m4_patsubst, m4_regexp, m4_substr, m4_translit, m4_text_wrap): these. Adjust all dependencies. * acgeneral.m4: Adjust. * tests/m4sugar.at: Adjust. * autoconf.m4 (m4exit, patsubst, regexp, substr, translit): Reestablish them.
2000-11-03 16:53:26 +08:00
m4_text_wrap([Super long documentation.], [ ], [ --too-wide], 30)
Move the Autoconf independent shell macros into the file `shell.m4' and the name space `AS_*'. * acgeneral.m4 (AC_SHELL_IFELSE, _AC_SHELL_TMPDIR, AC_SHELL_UNSET) (AC_SHELL_MKDIR_P, AC_SHELL_DIRNAME): Rename and move to... * shell.m4 (AS_IFELSE, AS_TMPDIR, AS_UNSET, AS_MKDIR_P) (AS_DIRNAME): here, a new file. Adjust all dependencies. * tests/base.m4 (m4_wrap): Eve out into... * tests/shell.m4: here, new file. * tests/base.m4 (AC_SHELL_MKDIR_P) (AC_SHELL_DIRNAME & AC_SHELL_DIRNAME_SED): Eve out into... * tests/m4sugar.m4 (AS_MKDIR_P, AS_DIRNAME & AS_DIRNAME_SED): here, new file. Adjust the test suite.
2000-10-26 01:51:10 +08:00
* m4sugar.m4 (m4_rename_m4, m4_copy_unm4): New macros. Use them. (debugfile, debugmode, m4exit, m4wrap, maketemp, patsubst, regexp) (substr, translit, m4_wrap): Rename as... (m4_debugfile, m4_debugmode, m4_exit, m4_wrap, m4_maketemp) (m4_patsubst, m4_regexp, m4_substr, m4_translit, m4_text_wrap): these. Adjust all dependencies. * acgeneral.m4: Adjust. * tests/m4sugar.at: Adjust. * autoconf.m4 (m4exit, patsubst, regexp, substr, translit): Reestablish them.
2000-11-03 16:53:26 +08:00
m4_text_wrap([First, second , third, [,quoted]])
Move the Autoconf independent shell macros into the file `shell.m4' and the name space `AS_*'. * acgeneral.m4 (AC_SHELL_IFELSE, _AC_SHELL_TMPDIR, AC_SHELL_UNSET) (AC_SHELL_MKDIR_P, AC_SHELL_DIRNAME): Rename and move to... * shell.m4 (AS_IFELSE, AS_TMPDIR, AS_UNSET, AS_MKDIR_P) (AS_DIRNAME): here, a new file. Adjust all dependencies. * tests/base.m4 (m4_wrap): Eve out into... * tests/shell.m4: here, new file. * tests/base.m4 (AC_SHELL_MKDIR_P) (AC_SHELL_DIRNAME & AC_SHELL_DIRNAME_SED): Eve out into... * tests/m4sugar.m4 (AS_MKDIR_P, AS_DIRNAME & AS_DIRNAME_SED): here, new file. Adjust the test suite.
2000-10-26 01:51:10 +08:00
]])
AT_DATA(expout,
[[/* Short string */
/* Much longer
string */
--short Short doc.
--too-wide
Short doc.
--too-wide
Super long
documentation.
First, second , third, [,quoted]
]])
The use of `dumpstat' revealed that `len' was used although it should not. m4_text_wrap was using it, but in the Autoconf world where it is legal. Hence (i) test M4sh in its own world, not Autoconf's, and (ii), ahem, fix the bug :) * lib/autotest/general.m4: Be sure the set good quotes, as tracing does not like `' instead of []. (AT_INIT): Forbid `^_?AT_'. And don't output such tokens. * tests/Makefile.am (CLEANFILES): Add `script', `script.s4g', `script.as', and `autom4te.cache'. Remove `empty' and `macro' which are no longer used. * tests/atspecific.m4 (AT_CHECK_M4SUGAR, AT_CHECK_M4SH): New. * tests/m4sugar.at: Use it. * lib/m4sugar/m4sugar.m4: Use `m4_len' not `len'.
2001-08-07 15:56:40 +08:00
AT_CHECK_M4SUGAR([-o-], 0, [expout])
Move the Autoconf independent shell macros into the file `shell.m4' and the name space `AS_*'. * acgeneral.m4 (AC_SHELL_IFELSE, _AC_SHELL_TMPDIR, AC_SHELL_UNSET) (AC_SHELL_MKDIR_P, AC_SHELL_DIRNAME): Rename and move to... * shell.m4 (AS_IFELSE, AS_TMPDIR, AS_UNSET, AS_MKDIR_P) (AS_DIRNAME): here, a new file. Adjust all dependencies. * tests/base.m4 (m4_wrap): Eve out into... * tests/shell.m4: here, new file. * tests/base.m4 (AC_SHELL_MKDIR_P) (AC_SHELL_DIRNAME & AC_SHELL_DIRNAME_SED): Eve out into... * tests/m4sugar.m4 (AS_MKDIR_P, AS_DIRNAME & AS_DIRNAME_SED): here, new file. Adjust the test suite.
2000-10-26 01:51:10 +08:00
* tests/atgeneral.m4 (AT_CHECK): Make exit status report more visible. * tests/atspecific.m4 (AT_CHECK_AUTOCONF): Support FLAGS, STDOUT and STDERR. (AT_CHECK_CONFIGURE): Support plenty, cleanup defs when needed. Spread their use in the whole suite. Simplify a few AT_CLEANUPs.
2000-12-19 16:15:48 +08:00
AT_CLEANUP
Reference in New Issue Copy Permalink