mirror/autoconf
2
0
Fork 0
mirror of git://git.sv.gnu.org/autoconf synced 2025-03-31 15:00:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ensure unnamed test group categories are separated from previous.

Browse Source 
* doc/autoconf.texi (Writing Testsuites) <AT_BANNER>: Update
description.
* lib/autotest/general.m4 (AT_INIT) <at_fn_banner>: Set banner
to single space, not empty line, once printed.  For empty
banners, print a single empty line to separate them from a
previous test group category.
* tests/autotest.at (Banners): Insert another test group; adjust
tests accordingly.  Extend test to cover semantic change.
* NEWS: Update.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
This commit is contained in:
Ralf Wildenhues 2010-08-02 21:10:00 +02:00
parent 55072aea4a
commit a5e9aa68b7
5 changed files with 37 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ChangeLog
View File

@ -1,3 +1,16 @@
2010-08-02 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ensure unnamed test group categories are separated from previous.
* doc/autoconf.texi (Writing Testsuites) <AT_BANNER>: Update
description.
* lib/autotest/general.m4 (AT_INIT) <at_fn_banner>: Set banner
to single space, not empty line, once printed. For empty
banners, print a single empty line to separate them from a
previous test group category.
* tests/autotest.at (Banners): Insert another test group; adjust
tests accordingly. Extend test to cover semantic change.
* NEWS: Update.
2010-07-31 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Fix typos in perlpod docs.

3
NEWS
View File

@ -2,6 +2,9 @@ GNU Autoconf NEWS - User visible changes.
* Noteworthy changes in release ?.? (????-??-??) [?]
** AT_BANNER() with empty argument will cause visual separation from previous
test category.
* Major changes in Autoconf 2.67 (2010-07-21) [stable]
Released by Eric Blake, based on git versions 2.66.*.

5
doc/autoconf.texi
View File

@ -23755,9 +23755,8 @@ When the resulting @file{testsuite} is invoked with more than one test
group to run, its output will include a banner containing
@var{test-category-name} prior to any tests run from that category. The
banner should be no more than about 40 or 50 characters. A blank banner
will not print, effectively ending a category and letting subsequent
test groups behave as though they are uncategorized when run in
isolation.
indicates uncategorized tests; an empty line will be inserted after
tests from an earlier category, effectively ending that category.
@end defmac
@defmac AT_SETUP (@var{test-group-name})

12
lib/autotest/general.m4
View File

@ -233,7 +233,7 @@ case $at_groups in
at_print_banners=: ;;
* ) at_print_banners=false ;;
esac
# Text for banner N, set to empty once printed.
# Text for banner N, set to a single space once printed.
m4_divert_pop([BANNERS])dnl back to DEFAULTS
m4_divert_push([PREPARE_TESTS])dnl
@ -246,9 +246,13 @@ at_fn_banner ()
{
$at_print_banners || return 0
eval at_banner_text=\$at_banner_text_$[1]
test "x$at_banner_text" = x && return 0
eval at_banner_text_$[1]=
AS_ECHO(["$as_nl$at_banner_text$as_nl"])
test "x$at_banner_text" = "x " && return 0
eval "at_banner_text_$[1]=\" \""
if test -z "$at_banner_text"; then
$at_first || echo
else
AS_ECHO(["$as_nl$at_banner_text$as_nl"])
fi
} # at_fn_banner
AS_FUNCTION_DESCRIBE([at_fn_check_prepare_notrace], [REASON LINE],

16
tests/autotest.at
View File

@ -956,15 +956,18 @@ AT_CHECK(:)
AT_CLEANUP
AT_BANNER()
AT_SETUP(two)# 4
AT_SETUP(two a)# 4
AT_CHECK(:)
AT_CLEANUP
AT_SETUP(two b)# 5
AT_CHECK(:)
AT_CLEANUP
AT_BANNER([second])
AT_SETUP(three a)# 5
AT_SETUP(three a)# 6
AT_CHECK(:)
AT_CLEANUP
AT_SETUP(three b)# 6
AT_SETUP(three b)# 7
AT_CHECK(:)
AT_CLEANUP
]])
@ -983,8 +986,11 @@ AT_CHECK_BANNERS([-2], [first], [1], [second], [0])
AT_CHECK_BANNERS([-3], [first], [1], [second], [0])
AT_CHECK_BANNERS([-k one], [first], [1], [second], [0])
AT_CHECK_BANNERS([3-4], [first], [1], [second], [0])
AT_CHECK_BANNERS([3-5], [first], [1], [second], [1])
AT_CHECK_BANNERS([4-5], [first], [0], [second], [1])
dnl There should be an empty line separating the first category from the
dnl unnamed one.
AT_CHECK([sed -n '/one b/,/two a/p' stdout | grep '^$'], [0], [ignore])
AT_CHECK_BANNERS([3-6], [first], [1], [second], [1])
AT_CHECK_BANNERS([4-6], [first], [0], [second], [1])
AT_CHECK_BANNERS([3-], [first], [1], [second], [1])
AT_CHECK_BANNERS([-k a], [first], [1], [second], [1])
AT_CHECK_BANNERS([4], [first], [0], [second], [0])