mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-21 20:40:05 +00:00
Do not terminate default test runs on test failure.
This patch is an updated version of <https://sourceware.org/ml/libc-alpha/2014-01/msg00198.html> and <https://sourceware.org/ml/libc-alpha/2014-03/msg00180.html>. Normal practice for software testsuites is that rather than terminating immediately when a test fails, they continue running and report at the end on how many tests passed or failed. The principle behind the glibc testsuite stopping on failure was probably that the expected state is no failures and so any failure indicates a problem such as miscompilation. In practice, while this is fairly close to true for native testing on x86_64 and x86 (kernel bugs and race conditions can still cause intermittent failures), it's less likely to be the case on other platforms, and so people testing glibc run the testsuite with "make -k" and then examine the logs to determine whether the failures are what they expect to fail on that platform, possibly with some automation for the comparison. This patch switches the glibc testsuite to the normal convention of not stopping on failure - unless you use stop-on-test-failure=y, in which case it behaves essentially as it did before (and does not generate overall test summaries on failure). Instead, the summary tests.sum may contain tests that FAILed. At the end of the test run, any FAIL or ERROR lines from tests.sum are printed, and then it exits with error status if there were any such lines. In addition, build failures will also cause the test run to stop - this has the justification that those *do* indicate serious problems that should be promptly fixed and aren't generally hard to fix (but apart from that, avoiding the build stopping on those failures seems harder). Note that unlike the previous patches in this series, this *does* require people with automation around testing glibc to change their processes - either to start using tests.sum / xtests.sum to track failures and compare them with expectations (with or without also using "make -k" and examining "make" logs to identify build failures), or else to use stop-on-test-failure=y and ignore the new tests.sum / xtests.sum mechanism. (If all you check is the exit status from "make check", no changes are needed unless you want to avoid test runs continuing after the first failure.) Tested x86_64. * scripts/evaluate-test.sh: Handle fourth argument to determine whether test run should stop on failure. * Makeconfig (stop-on-test-failure): New variable. (evaluate-test): Pass fourth argument to evaluate-test.sh based on $(stop-on-test-failure). * Makefile (tests): Give a summary of results from testing and exit with failure status if they include an ERROR or FAIL. (xtests): Likewise. * manual/install.texi (Configuring and compiling): Mention stop-on-test-failure=y. * INSTALL: Regenerated.
This commit is contained in:
parent
22dbc19dbb
commit
d6fe5e582d
14
ChangeLog
14
ChangeLog
@ -1,3 +1,17 @@
|
|||||||
|
2014-03-14 Joseph Myers <joseph@codesourcery.com>
|
||||||
|
|
||||||
|
* scripts/evaluate-test.sh: Handle fourth argument to determine
|
||||||
|
whether test run should stop on failure.
|
||||||
|
* Makeconfig (stop-on-test-failure): New variable.
|
||||||
|
(evaluate-test): Pass fourth argument to evaluate-test.sh based on
|
||||||
|
$(stop-on-test-failure).
|
||||||
|
* Makefile (tests): Give a summary of results from testing and
|
||||||
|
exit with failure status if they include an ERROR or FAIL.
|
||||||
|
(xtests): Likewise.
|
||||||
|
* manual/install.texi (Configuring and compiling): Mention
|
||||||
|
stop-on-test-failure=y.
|
||||||
|
* INSTALL: Regenerated.
|
||||||
|
|
||||||
2014-03-14 Roland McGrath <roland@hack.frob.com>
|
2014-03-14 Roland McGrath <roland@hack.frob.com>
|
||||||
|
|
||||||
* scripts/versionlist.awk: New file.
|
* scripts/versionlist.awk: New file.
|
||||||
|
6
INSTALL
6
INSTALL
@ -203,6 +203,12 @@ The tests (and later installation) use some pre-existing files of the
|
|||||||
system such as `/etc/passwd', `/etc/nsswitch.conf' and others. These
|
system such as `/etc/passwd', `/etc/nsswitch.conf' and others. These
|
||||||
files must all contain correct and sensible content.
|
files must all contain correct and sensible content.
|
||||||
|
|
||||||
|
Normally, `make check' will run all the tests before reporting all
|
||||||
|
problems found and exiting with error status if any problems occurred.
|
||||||
|
You can specify `stop-on-test-failure=y' when running `make check' to
|
||||||
|
make the test run stop and exit with an error status immediately when a
|
||||||
|
failure occurs.
|
||||||
|
|
||||||
To format the `GNU C Library Reference Manual' for printing, type
|
To format the `GNU C Library Reference Manual' for printing, type
|
||||||
`make dvi'. You need a working TeX installation to do this. The
|
`make dvi'. You need a working TeX installation to do this. The
|
||||||
distribution builds the on-line formatted version of the manual, as
|
distribution builds the on-line formatted version of the manual, as
|
||||||
|
@ -601,6 +601,12 @@ run-built-tests = yes
|
|||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
# Whether to stop immediately when a test fails. Nonempty means to
|
||||||
|
# stop, empty means not to stop.
|
||||||
|
ifndef stop-on-test-failure
|
||||||
|
stop-on-test-failure =
|
||||||
|
endif
|
||||||
|
|
||||||
# How to run a program we just linked with our library.
|
# How to run a program we just linked with our library.
|
||||||
# The program binary is assumed to be $(word 2,$^).
|
# The program binary is assumed to be $(word 2,$^).
|
||||||
built-program-file = $(dir $(word 2,$^))$(notdir $(word 2,$^))
|
built-program-file = $(dir $(word 2,$^))$(notdir $(word 2,$^))
|
||||||
@ -1092,6 +1098,7 @@ test-xfail-name = $(strip $(patsubst %.out, %, $(patsubst $(objpfx)%, %, $@)))
|
|||||||
# XPASS or XFAIL rather than PASS or FAIL.
|
# XPASS or XFAIL rather than PASS or FAIL.
|
||||||
evaluate-test = $(..)scripts/evaluate-test.sh $(test-name) $$? \
|
evaluate-test = $(..)scripts/evaluate-test.sh $(test-name) $$? \
|
||||||
$(if $(test-xfail-$(test-xfail-name)),true,false) \
|
$(if $(test-xfail-$(test-xfail-name)),true,false) \
|
||||||
|
$(if $(stop-on-test-failure),true,false) \
|
||||||
> $(common-objpfx)$(test-name).test-result
|
> $(common-objpfx)$(test-name).test-result
|
||||||
|
|
||||||
endif # Makeconfig not yet included
|
endif # Makeconfig not yet included
|
||||||
|
12
Makefile
12
Makefile
@ -324,10 +324,22 @@ tests: $(tests-special)
|
|||||||
$(..)scripts/merge-test-results.sh -t $(objpfx) subdir-tests.sum \
|
$(..)scripts/merge-test-results.sh -t $(objpfx) subdir-tests.sum \
|
||||||
$(sort $(subdirs) .) \
|
$(sort $(subdirs) .) \
|
||||||
> $(objpfx)tests.sum
|
> $(objpfx)tests.sum
|
||||||
|
@grep '^ERROR:' $(objpfx)tests.sum || true
|
||||||
|
@grep '^FAIL:' $(objpfx)tests.sum || true
|
||||||
|
@echo "Summary of test results:"
|
||||||
|
@sed 's/:.*//' < $(objpfx)tests.sum | sort | uniq -c
|
||||||
|
@if grep -q '^ERROR:' $(objpfx)tests.sum; then exit 1; fi
|
||||||
|
@if grep -q '^FAIL:' $(objpfx)tests.sum; then exit 1; fi
|
||||||
xtests:
|
xtests:
|
||||||
$(..)scripts/merge-test-results.sh -t $(objpfx) subdir-xtests.sum \
|
$(..)scripts/merge-test-results.sh -t $(objpfx) subdir-xtests.sum \
|
||||||
$(sort $(subdirs)) \
|
$(sort $(subdirs)) \
|
||||||
> $(objpfx)xtests.sum
|
> $(objpfx)xtests.sum
|
||||||
|
@grep '^ERROR:' $(objpfx)xtests.sum || true
|
||||||
|
@grep '^FAIL:' $(objpfx)xtests.sum || true
|
||||||
|
@echo "Summary of test results for extra tests:"
|
||||||
|
@sed 's/:.*//' < $(objpfx)xtests.sum | sort | uniq -c
|
||||||
|
@if grep -q '^ERROR:' $(objpfx)xtests.sum; then exit 1; fi
|
||||||
|
@if grep -q '^FAIL:' $(objpfx)xtests.sum; then exit 1; fi
|
||||||
|
|
||||||
# The realclean target is just like distclean for the parent, but we want
|
# The realclean target is just like distclean for the parent, but we want
|
||||||
# the subdirs to know the difference in case they care.
|
# the subdirs to know the difference in case they care.
|
||||||
|
7
NEWS
7
NEWS
@ -13,6 +13,13 @@ Version 2.20
|
|||||||
16611, 16613, 16623, 16632, 16639, 16642, 16670, 16674, 16677, 16683,
|
16611, 16613, 16623, 16632, 16639, 16642, 16670, 16674, 16677, 16683,
|
||||||
16689, 16695, 16701, 16706, 16707.
|
16689, 16695, 16701, 16706, 16707.
|
||||||
|
|
||||||
|
* Running the testsuite no longer terminates as soon as a test fails.
|
||||||
|
Instead, a file tests.sum (xtests.sum from "make xcheck") is generated,
|
||||||
|
with PASS or FAIL lines for individual tests. A summary of the results is
|
||||||
|
printed, including a list of failing lists, and "make check" exits with
|
||||||
|
error status if there were any unexpected failures. "make check
|
||||||
|
stop-on-test-failure=y" may be used to keep the old behavior.
|
||||||
|
|
||||||
* The am33 port, which had not worked for several years, has been removed
|
* The am33 port, which had not worked for several years, has been removed
|
||||||
from ports.
|
from ports.
|
||||||
|
|
||||||
|
@ -235,6 +235,12 @@ The tests (and later installation) use some pre-existing files of the
|
|||||||
system such as @file{/etc/passwd}, @file{/etc/nsswitch.conf} and others.
|
system such as @file{/etc/passwd}, @file{/etc/nsswitch.conf} and others.
|
||||||
These files must all contain correct and sensible content.
|
These files must all contain correct and sensible content.
|
||||||
|
|
||||||
|
Normally, @code{make check} will run all the tests before reporting
|
||||||
|
all problems found and exiting with error status if any problems
|
||||||
|
occurred. You can specify @samp{stop-on-test-failure=y} when running
|
||||||
|
@code{make check} to make the test run stop and exit with an error
|
||||||
|
status immediately when a failure occurs.
|
||||||
|
|
||||||
To format the @cite{GNU C Library Reference Manual} for printing, type
|
To format the @cite{GNU C Library Reference Manual} for printing, type
|
||||||
@w{@code{make dvi}}. You need a working @TeX{} installation to do
|
@w{@code{make dvi}}. You need a working @TeX{} installation to do
|
||||||
this. The distribution builds the on-line formatted version of the
|
this. The distribution builds the on-line formatted version of the
|
||||||
|
@ -17,12 +17,13 @@
|
|||||||
# License along with the GNU C Library; if not, see
|
# License along with the GNU C Library; if not, see
|
||||||
# <http://www.gnu.org/licenses/>.
|
# <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
# usage: evaluate-test.sh test_name rc xfail
|
# usage: evaluate-test.sh test_name rc xfail stop_on_failure
|
||||||
|
|
||||||
test_name=$1
|
test_name=$1
|
||||||
rc=$2
|
rc=$2
|
||||||
orig_rc=$rc
|
orig_rc=$rc
|
||||||
xfail=$3
|
xfail=$3
|
||||||
|
stop_on_failure=$4
|
||||||
|
|
||||||
if [ $rc -eq 0 ]; then
|
if [ $rc -eq 0 ]; then
|
||||||
result="PASS"
|
result="PASS"
|
||||||
@ -37,4 +38,8 @@ fi
|
|||||||
|
|
||||||
echo "$result: $test_name"
|
echo "$result: $test_name"
|
||||||
echo "original exit status $orig_rc"
|
echo "original exit status $orig_rc"
|
||||||
exit $rc
|
if $stop_on_failure; then
|
||||||
|
exit $rc
|
||||||
|
else
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
Loading…
Reference in New Issue
Block a user