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

* tests/atgeneral.m4 (AT_INIT) <at_verbose>: Be a :/echo variable.

Browse Source 
<at_silent>: Remove.
(AT_CLEANUP): Clean up the diversion use.
This commit is contained in:
Akim Demaille 2000-11-23 09:52:08 +00:00
parent e490f231b9
commit 755bc2706a
4 changed files with 61 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2000-11-23 Akim Demaille <akim@epita.fr>
* tests/atgeneral.m4 (AT_INIT) <at_verbose>: Be a :/echo variable.
<at_silent>: Remove.
(AT_CLEANUP): Clean up the diversion use.
2000-11-23 Akim Demaille <akim@epita.fr> 2000-11-23 Akim Demaille <akim@epita.fr>
Factor part of the prologue of the tests. Factor part of the prologue of the tests.

66
lib/autotest/general.m4
View File

@ -79,20 +79,17 @@ at_stop_on_error=false;
# Shall we save and check stdout and stderr? # Shall we save and check stdout and stderr?
# -n sets to false # -n sets to false
at_check_stds=:; at_check_stds=:;
# Shall we be verbose # Shall we be verbose?
# -s sets to false, and -v to true at_verbose=:
at_verbose=false
# Shall we keep the debug scripts? Must be `:' when testsuite is # Shall we keep the debug scripts? Must be `:' when testsuite is
# run by a debug script, so that the script doesn't remove itself. # run by a debug script, so that the script doesn't remove itself.
# -s sets to false, and -v to true
at_debug=false at_debug=false
at_usage="Usage: $[0] [OPTION]... at_usage="Usage: $[0] [OPTION]...
-e Abort the full suite and inhibit normal clean up if a test fails -e Abort the full suite and inhibit normal clean up if a test fails
-n Do not redirect stdout and stderr and do not test their contents -n Do not redirect stdout and stderr and do not test their contents
-s Inhibit verbosity while generating or executing debugging scripts -v Force more detailed output, default for debugging scripts
-v Force more detailed output, default for debugging scripts unless -s
-x Have the shell to trace command execution; also implies option -n" -x Have the shell to trace command execution; also implies option -n"
while test $[#] -gt 0; do while test $[#] -gt 0; do
@ -102,8 +99,7 @@ while test $[#] -gt 0; do
-d) at_debug=:;; -d) at_debug=:;;
-e) at_stop_on_error=:;; -e) at_stop_on_error=:;;
-n) at_check_stds=false;; -n) at_check_stds=false;;
-s) at_verbose=false; at_silent=1;; -v) at_verbose=echo;;
-v) at_verbose=:; at_silent=;;
-x) at_traceon='set -vx'; at_traceoff='set +vx'; at_check_stds=false;; -x) at_traceon='set -vx'; at_traceoff='set +vx'; at_check_stds=false;;
*) echo 1>&2 "Try \`$[0] --help' for more information."; exit 1 ;; *) echo 1>&2 "Try \`$[0] --help' for more information."; exit 1 ;;
esac esac
@ -162,8 +158,7 @@ do
m4_divert_pop[]dnl m4_divert_pop[]dnl
m4_divert_push(3)[]dnl m4_divert_push(3)[]dnl
esac esac
$at_verbose && $at_verbose $at_n " $test. $srcdir/`cat at-setup-line`: $at_c"
echo $at_n " AT_ordinal. $srcdir/`cat at-setup-line`: $at_c"
case $at_status in case $at_status in
0) echo ok 0) echo ok
;; ;;
@ -224,19 +219,16 @@ echo "$at_banner"
echo "$at_dashes" echo "$at_dashes"
if test $at_debug = false && test -n "$at_failed_list"; then if test $at_debug = false && test -n "$at_failed_list"; then
if test -z "$at_silent"; then echo
echo echo 'When reporting failed tests to maintainers, do not merely list test'
echo 'When reporting failed tests to maintainers, do not merely list test' echo 'numbers, as the numbering changes between releases and pretests.'
echo 'numbers, as the numbering changes between releases and pretests.' echo 'Be careful to give at least all the information you got about them.'
echo 'Be careful to give at least all the information you got about them.' echo 'You may investigate any problem if you feel able to do so, in which'
echo 'You may investigate any problem if you feel able to do so, in which' echo 'case the testsuite provide a good starting point.'
echo 'case the generated debugging scripts provide good starting points.' echo 'information. Now, failed tests will be executed again, verbosely.'
echo "Go on and modify them at will. \`./debug-NN --help' gives usage" for at_group in $at_failed_list; do
echo 'information. Now, failed tests will be executed again, verbosely.' ./debug-$at_group.sh
for at_group in $at_failed_list; do done
./debug-$at_group.sh
done
fi
exit 1 exit 1
fi fi
@ -264,11 +256,9 @@ m4_divert_pop()dnl
dnl Here will be inserted the `rm' corresponding to AT_CLEANUP. dnl Here will be inserted the `rm' corresponding to AT_CLEANUP.
m4_divert(2)[]dnl m4_divert(2)[]dnl
echo AT_LINE > at-setup-line echo AT_LINE > at-setup-line
if $at_verbose; then $at_verbose 'testing $1'
echo 'testing $1' $at_verbose $at_n " $at_c"
echo $at_n " $at_c" if test $at_verbose = echo; then
fi
if $at_verbose; then
echo "AT_ordinal. $srcdir/AT_LINE..." echo "AT_ordinal. $srcdir/AT_LINE..."
else else
echo $at_n "m4_substr(AT_ordinal. $srcdir/AT_LINE , 0, 30)[]$at_c" echo $at_n "m4_substr(AT_ordinal. $srcdir/AT_LINE , 0, 30)[]$at_c"
@ -289,14 +279,12 @@ AT_DEFINE([AT_CLEANUP],
at_status=$? at_status=$?
at_test_count=`expr 1 + $at_test_count` at_test_count=`expr 1 + $at_test_count`
if $at_stop_on_error && test -n "$at_failed_list"; then :; else if $at_stop_on_error && test -n "$at_failed_list"; then :; else
m4_divert(1)[]dnl
rm ifelse([AT_data_files$1], , [-f], [-rf[]AT_data_files[]ifelse($1, , , [ $1])]) stdout stderr[]AT_data_expout[]AT_data_experr
m4_undivert(2)[]dnl
rm ifelse([AT_data_files$1], , [-f], [-rf[]AT_data_files[]ifelse($1, , , [ $1])]) stdout stderr[]AT_data_expout[]AT_data_experr rm ifelse([AT_data_files$1], , [-f], [-rf[]AT_data_files[]ifelse($1, , , [ $1])]) stdout stderr[]AT_data_expout[]AT_data_experr
fi fi
;; ;;
m4_divert(1)[]dnl
rm ifelse([AT_data_files$1], , [-f], [-rf[]AT_data_files[]ifelse($1, , , [ $1])]) stdout stderr[]AT_data_expout[]AT_data_experr
m4_undivert(2)[]dnl
m4_popdef([AT_data_experr])dnl m4_popdef([AT_data_experr])dnl
m4_popdef([AT_data_expout])dnl m4_popdef([AT_data_expout])dnl
m4_popdef([AT_data_files])dnl m4_popdef([AT_data_files])dnl
@ -330,7 +318,7 @@ $2[]_ATEOF
# their content is not checked. # their content is not checked.
AT_DEFINE([AT_CHECK], AT_DEFINE([AT_CHECK],
[$at_traceoff [$at_traceoff
$at_verbose && echo "$srcdir/AT_LINE: m4_patsubst([$1], [\([\"`$]\)], \\\1)" $at_verbose "$srcdir/AT_LINE: m4_patsubst([$1], [\([\"`$]\)], \\\1)"
echo AT_LINE > at-check-line echo AT_LINE > at-check-line
$at_check_stds && exec 5>&1 6>&2 1>stdout 2>stderr $at_check_stds && exec 5>&1 6>&2 1>stdout 2>stderr
$at_traceon $at_traceon
@ -338,9 +326,9 @@ $1
ifelse([$2], [], [], ifelse([$2], [], [],
[at_status=$? [at_status=$?
if test $at_status != $2; then if test $at_status != $2; then
$at_verbose && echo "Exit code was $at_status, expected $2" >&6 $at_verbose "Exit code was $at_status, expected $2" >&6
dnl Maybe there was an important message to read before it died. dnl Maybe there was an important message to read before it died.
$at_verbose && $at_check_stds && cat stderr >&6 $at_verbose = echo && $at_check_stds && cat stderr >&6
dnl Preserve exit code 77. dnl Preserve exit code 77.
test $at_status = 77 && exit 77 test $at_status = 77 && exit 77
exit 1 exit 1
@ -351,16 +339,16 @@ if $at_check_stds; then
dnl Restore stdout to fd1 and stderr to fd2. dnl Restore stdout to fd1 and stderr to fd2.
exec 1>&5 2>&6 exec 1>&5 2>&6
dnl If not verbose, neutralize the output of diff. dnl If not verbose, neutralize the output of diff.
$at_verbose || exec 1>/dev/null 2>/dev/null test $at_verbose = echo && exec 1>/dev/null 2>/dev/null
at_failed=false; at_failed=false;
m4_case([$4], m4_case([$4],
ignore, [$at_verbose && cat stderr;:], ignore, [$at_verbose = echo && cat stderr;:],
experr, [AT_DEFINE([AT_data_experr], [ experr])dnl experr, [AT_DEFINE([AT_data_experr], [ experr])dnl
$at_diff experr stderr || at_failed=:], $at_diff experr stderr || at_failed=:],
[], [$at_diff empty stderr || at_failed=:], [], [$at_diff empty stderr || at_failed=:],
[echo $at_n "m4_patsubst([$4], [\([\"`$]\)], \\\1)$at_c" | $at_diff - stderr || at_failed=:]) [echo $at_n "m4_patsubst([$4], [\([\"`$]\)], \\\1)$at_c" | $at_diff - stderr || at_failed=:])
m4_case([$3], m4_case([$3],
ignore, [$at_verbose && cat stdout;:], ignore, [test $at_verbose = echo && cat stdout;:],
expout, [AT_DEFINE([AT_data_expout], [ expout])dnl expout, [AT_DEFINE([AT_data_expout], [ expout])dnl
$at_diff expout stdout || at_failed=:], $at_diff expout stdout || at_failed=:],
[], [$at_diff empty stdout || at_failed=:], [], [$at_diff empty stdout || at_failed=:],

66
tests/atgeneral.m4
View File

@ -79,20 +79,17 @@ at_stop_on_error=false;
# Shall we save and check stdout and stderr? # Shall we save and check stdout and stderr?
# -n sets to false # -n sets to false
at_check_stds=:; at_check_stds=:;
# Shall we be verbose # Shall we be verbose?
# -s sets to false, and -v to true at_verbose=:
at_verbose=false
# Shall we keep the debug scripts? Must be `:' when testsuite is # Shall we keep the debug scripts? Must be `:' when testsuite is
# run by a debug script, so that the script doesn't remove itself. # run by a debug script, so that the script doesn't remove itself.
# -s sets to false, and -v to true
at_debug=false at_debug=false
at_usage="Usage: $[0] [OPTION]... at_usage="Usage: $[0] [OPTION]...
-e Abort the full suite and inhibit normal clean up if a test fails -e Abort the full suite and inhibit normal clean up if a test fails
-n Do not redirect stdout and stderr and do not test their contents -n Do not redirect stdout and stderr and do not test their contents
-s Inhibit verbosity while generating or executing debugging scripts -v Force more detailed output, default for debugging scripts
-v Force more detailed output, default for debugging scripts unless -s
-x Have the shell to trace command execution; also implies option -n" -x Have the shell to trace command execution; also implies option -n"
while test $[#] -gt 0; do while test $[#] -gt 0; do
@ -102,8 +99,7 @@ while test $[#] -gt 0; do
-d) at_debug=:;; -d) at_debug=:;;
-e) at_stop_on_error=:;; -e) at_stop_on_error=:;;
-n) at_check_stds=false;; -n) at_check_stds=false;;
-s) at_verbose=false; at_silent=1;; -v) at_verbose=echo;;
-v) at_verbose=:; at_silent=;;
-x) at_traceon='set -vx'; at_traceoff='set +vx'; at_check_stds=false;; -x) at_traceon='set -vx'; at_traceoff='set +vx'; at_check_stds=false;;
*) echo 1>&2 "Try \`$[0] --help' for more information."; exit 1 ;; *) echo 1>&2 "Try \`$[0] --help' for more information."; exit 1 ;;
esac esac
@ -162,8 +158,7 @@ do
m4_divert_pop[]dnl m4_divert_pop[]dnl
m4_divert_push(3)[]dnl m4_divert_push(3)[]dnl
esac esac
$at_verbose && $at_verbose $at_n " $test. $srcdir/`cat at-setup-line`: $at_c"
echo $at_n " AT_ordinal. $srcdir/`cat at-setup-line`: $at_c"
case $at_status in case $at_status in
0) echo ok 0) echo ok
;; ;;
@ -224,19 +219,16 @@ echo "$at_banner"
echo "$at_dashes" echo "$at_dashes"
if test $at_debug = false && test -n "$at_failed_list"; then if test $at_debug = false && test -n "$at_failed_list"; then
if test -z "$at_silent"; then echo
echo echo 'When reporting failed tests to maintainers, do not merely list test'
echo 'When reporting failed tests to maintainers, do not merely list test' echo 'numbers, as the numbering changes between releases and pretests.'
echo 'numbers, as the numbering changes between releases and pretests.' echo 'Be careful to give at least all the information you got about them.'
echo 'Be careful to give at least all the information you got about them.' echo 'You may investigate any problem if you feel able to do so, in which'
echo 'You may investigate any problem if you feel able to do so, in which' echo 'case the testsuite provide a good starting point.'
echo 'case the generated debugging scripts provide good starting points.' echo 'information. Now, failed tests will be executed again, verbosely.'
echo "Go on and modify them at will. \`./debug-NN --help' gives usage" for at_group in $at_failed_list; do
echo 'information. Now, failed tests will be executed again, verbosely.' ./debug-$at_group.sh
for at_group in $at_failed_list; do done
./debug-$at_group.sh
done
fi
exit 1 exit 1
fi fi
@ -264,11 +256,9 @@ m4_divert_pop()dnl
dnl Here will be inserted the `rm' corresponding to AT_CLEANUP. dnl Here will be inserted the `rm' corresponding to AT_CLEANUP.
m4_divert(2)[]dnl m4_divert(2)[]dnl
echo AT_LINE > at-setup-line echo AT_LINE > at-setup-line
if $at_verbose; then $at_verbose 'testing $1'
echo 'testing $1' $at_verbose $at_n " $at_c"
echo $at_n " $at_c" if test $at_verbose = echo; then
fi
if $at_verbose; then
echo "AT_ordinal. $srcdir/AT_LINE..." echo "AT_ordinal. $srcdir/AT_LINE..."
else else
echo $at_n "m4_substr(AT_ordinal. $srcdir/AT_LINE , 0, 30)[]$at_c" echo $at_n "m4_substr(AT_ordinal. $srcdir/AT_LINE , 0, 30)[]$at_c"
@ -289,14 +279,12 @@ AT_DEFINE([AT_CLEANUP],
at_status=$? at_status=$?
at_test_count=`expr 1 + $at_test_count` at_test_count=`expr 1 + $at_test_count`
if $at_stop_on_error && test -n "$at_failed_list"; then :; else if $at_stop_on_error && test -n "$at_failed_list"; then :; else
m4_divert(1)[]dnl
rm ifelse([AT_data_files$1], , [-f], [-rf[]AT_data_files[]ifelse($1, , , [ $1])]) stdout stderr[]AT_data_expout[]AT_data_experr
m4_undivert(2)[]dnl
rm ifelse([AT_data_files$1], , [-f], [-rf[]AT_data_files[]ifelse($1, , , [ $1])]) stdout stderr[]AT_data_expout[]AT_data_experr rm ifelse([AT_data_files$1], , [-f], [-rf[]AT_data_files[]ifelse($1, , , [ $1])]) stdout stderr[]AT_data_expout[]AT_data_experr
fi fi
;; ;;
m4_divert(1)[]dnl
rm ifelse([AT_data_files$1], , [-f], [-rf[]AT_data_files[]ifelse($1, , , [ $1])]) stdout stderr[]AT_data_expout[]AT_data_experr
m4_undivert(2)[]dnl
m4_popdef([AT_data_experr])dnl m4_popdef([AT_data_experr])dnl
m4_popdef([AT_data_expout])dnl m4_popdef([AT_data_expout])dnl
m4_popdef([AT_data_files])dnl m4_popdef([AT_data_files])dnl
@ -330,7 +318,7 @@ $2[]_ATEOF
# their content is not checked. # their content is not checked.
AT_DEFINE([AT_CHECK], AT_DEFINE([AT_CHECK],
[$at_traceoff [$at_traceoff
$at_verbose && echo "$srcdir/AT_LINE: m4_patsubst([$1], [\([\"`$]\)], \\\1)" $at_verbose "$srcdir/AT_LINE: m4_patsubst([$1], [\([\"`$]\)], \\\1)"
echo AT_LINE > at-check-line echo AT_LINE > at-check-line
$at_check_stds && exec 5>&1 6>&2 1>stdout 2>stderr $at_check_stds && exec 5>&1 6>&2 1>stdout 2>stderr
$at_traceon $at_traceon
@ -338,9 +326,9 @@ $1
ifelse([$2], [], [], ifelse([$2], [], [],
[at_status=$? [at_status=$?
if test $at_status != $2; then if test $at_status != $2; then
$at_verbose && echo "Exit code was $at_status, expected $2" >&6 $at_verbose "Exit code was $at_status, expected $2" >&6
dnl Maybe there was an important message to read before it died. dnl Maybe there was an important message to read before it died.
$at_verbose && $at_check_stds && cat stderr >&6 $at_verbose = echo && $at_check_stds && cat stderr >&6
dnl Preserve exit code 77. dnl Preserve exit code 77.
test $at_status = 77 && exit 77 test $at_status = 77 && exit 77
exit 1 exit 1
@ -351,16 +339,16 @@ if $at_check_stds; then
dnl Restore stdout to fd1 and stderr to fd2. dnl Restore stdout to fd1 and stderr to fd2.
exec 1>&5 2>&6 exec 1>&5 2>&6
dnl If not verbose, neutralize the output of diff. dnl If not verbose, neutralize the output of diff.
$at_verbose || exec 1>/dev/null 2>/dev/null test $at_verbose = echo && exec 1>/dev/null 2>/dev/null
at_failed=false; at_failed=false;
m4_case([$4], m4_case([$4],
ignore, [$at_verbose && cat stderr;:], ignore, [$at_verbose = echo && cat stderr;:],
experr, [AT_DEFINE([AT_data_experr], [ experr])dnl experr, [AT_DEFINE([AT_data_experr], [ experr])dnl
$at_diff experr stderr || at_failed=:], $at_diff experr stderr || at_failed=:],
[], [$at_diff empty stderr || at_failed=:], [], [$at_diff empty stderr || at_failed=:],
[echo $at_n "m4_patsubst([$4], [\([\"`$]\)], \\\1)$at_c" | $at_diff - stderr || at_failed=:]) [echo $at_n "m4_patsubst([$4], [\([\"`$]\)], \\\1)$at_c" | $at_diff - stderr || at_failed=:])
m4_case([$3], m4_case([$3],
ignore, [$at_verbose && cat stdout;:], ignore, [test $at_verbose = echo && cat stdout;:],
expout, [AT_DEFINE([AT_data_expout], [ expout])dnl expout, [AT_DEFINE([AT_data_expout], [ expout])dnl
$at_diff expout stdout || at_failed=:], $at_diff expout stdout || at_failed=:],
[], [$at_diff empty stdout || at_failed=:], [], [$at_diff empty stdout || at_failed=:],

2
tests/atspecific.m4
View File

@ -48,7 +48,7 @@ rm -f state*
AT_CHECK([autoconf --autoconf-dir .. -l $at_srcdir], 0, [], []) AT_CHECK([autoconf --autoconf-dir .. -l $at_srcdir], 0, [], [])
AT_CHECK([autoheader --autoconf-dir .. -l $at_srcdir], 0, [], []) AT_CHECK([autoheader --autoconf-dir .. -l $at_srcdir], 0, [], [])
AT_CHECK([top_srcdir=$top_srcdir ./configure], 0, ignore, []) AT_CHECK([top_srcdir=$top_srcdir ./configure], 0, ignore, [])
test -n "$at_verbose" && echo "--- config.log" && cat config.log test $at_verbose = echo && echo "--- config.log" && cat config.log
dnl Some tests might exit prematurely when they find a problem, in dnl Some tests might exit prematurely when they find a problem, in
dnl which case `env-after' is probably missing. Don't check it then. dnl which case `env-after' is probably missing. Don't check it then.