mirror of
https://github.com/linux-apfs/apfstests.git
synced 2026-05-01 15:01:44 -07:00
check: fail tests if check/dmesg are not clean
Currently a test appears to pass even if it leaves a corrupt filesystem behind, or a splat in the system logs that should not be there. While the test is internally tracked as failed (and the summary reports it as failed) the per-test output exits with a success and so emits a completion time before the post-test checks are run by the test harness. Rework the check code to report post-test check failures as specific test failures rather than as separate failure line items in the overall harness output. Reworking where we emit the errors this also allows us to include the post-test filesystem checking in the test runtime. This is currently not accounted to the test and can be substantial. Hence the real elapsed time of each test is not accurately reflected in the time stats being reported and so regressions in filesystem checking performance go unnoticed. Changing the output reporting requires a complete reworking of the main test check loop. It's a bunch of spaghetti at the moment because it has post test reporting code at the end of the loop which must run regardless of the test result. By moving the post test reporting to the start of the next loop iteration, we can clean up the code substantially by using continue directives where appropriate. Also, for cases where we haven't run the test or it's already been marked as failed, don't bother running the filesystem/dmesg checks for failure as we're already going to report the test as failed. This touches almost all of the loop, so get rid of the remaining 4 space indents inside the loop while moving all this code around. [Eryu: fixed wrong test seq name issue in xUnit report when test hit "continue" in the check loop, e.g. notrun, with Dave ACKing the fix] Signed-Off-By: Dave Chinner <dchinner@redhat.com> Reviewed-by: Eryu Guan <guaneryu@gmail.com> Signed-off-by: Eryu Guan <guaneryu@gmail.com>
This commit is contained in:
Dave Chinner
Eryu Guan
@@ -38,10 +38,12 @@ randomize=false
|
||||
export here=`pwd`
|
||||
xfile=""
|
||||
brief_test_summary=false
|
||||
_err_msg=""
|
||||
do_report=false
|
||||
DUMP_OUTPUT=false
|
||||
|
||||
# This is a global variable used to pass test failure text to reporting gunk
|
||||
_err_msg=""
|
||||
|
||||
# start the initialisation work now
|
||||
iam=check
|
||||
|
||||
@@ -636,78 +638,99 @@ for section in $HOST_OPTIONS_SECTIONS; do
|
||||
seqres="$check"
|
||||
_check_test_fs
|
||||
|
||||
for seq in $list
|
||||
do
|
||||
err=false
|
||||
_err_msg=""
|
||||
if [ ! -f $seq ]; then
|
||||
# Try to get full name in case the user supplied only seq id
|
||||
# and the test has a name. A bit of hassle to find really
|
||||
# the test and not its sample output or helping files.
|
||||
bname=$(basename $seq)
|
||||
full_seq=$(find $(dirname $seq) -name $bname* -executable |
|
||||
awk '(NR == 1 || length < length(shortest)) { shortest = $0 }\
|
||||
END { print shortest }')
|
||||
if [ -f $full_seq ] \
|
||||
&& [ x$(echo $bname | grep -o "^$VALID_TEST_ID") != x ]; then
|
||||
seq=$full_seq
|
||||
fi
|
||||
fi
|
||||
err=false
|
||||
first_test=true
|
||||
prev_seq=""
|
||||
for seq in $list ; do
|
||||
# Run report for previous test!
|
||||
if $err ; then
|
||||
bad="$bad $seqnum"
|
||||
n_bad=`expr $n_bad + 1`
|
||||
tc_status="fail"
|
||||
fi
|
||||
if $do_report && ! $first_test ; then
|
||||
if [ $tc_status != "expunge" ] ; then
|
||||
_make_testcase_report "$prev_seq" "$tc_status"
|
||||
fi
|
||||
fi
|
||||
first_test=false
|
||||
|
||||
# the filename for the test and the name output are different.
|
||||
# we don't include the tests/ directory in the name output.
|
||||
export seqnum=`echo $seq | sed -e "s;$SRC_DIR/;;"`
|
||||
err=false
|
||||
prev_seq="$seq"
|
||||
if [ ! -f $seq ]; then
|
||||
# Try to get full name in case the user supplied only
|
||||
# seq id and the test has a name. A bit of hassle to
|
||||
# find really the test and not its sample output or
|
||||
# helping files.
|
||||
bname=$(basename $seq)
|
||||
full_seq=$(find $(dirname $seq) -name $bname* -executable |
|
||||
awk '(NR == 1 || length < length(shortest)) { shortest = $0 }\
|
||||
END { print shortest }')
|
||||
if [ -f $full_seq ] && \
|
||||
[ x$(echo $bname | grep -o "^$VALID_TEST_ID") != x ]; then
|
||||
seq=$full_seq
|
||||
fi
|
||||
fi
|
||||
|
||||
# Similarly, the result directory needs to replace the tests/
|
||||
# part of the test location.
|
||||
group=`dirname $seq`
|
||||
if $OPTIONS_HAVE_SECTIONS; then
|
||||
export RESULT_DIR=`echo $group | sed -e "s;$SRC_DIR;${RESULT_BASE}/$section;"`
|
||||
REPORT_DIR="$RESULT_BASE/$section"
|
||||
else
|
||||
export RESULT_DIR=`echo $group | sed -e "s;$SRC_DIR;$RESULT_BASE;"`
|
||||
REPORT_DIR="$RESULT_BASE"
|
||||
fi
|
||||
seqres="$REPORT_DIR/$seqnum"
|
||||
# the filename for the test and the name output are different.
|
||||
# we don't include the tests/ directory in the name output.
|
||||
export seqnum=`echo $seq | sed -e "s;$SRC_DIR/;;"`
|
||||
|
||||
mkdir -p $RESULT_DIR
|
||||
# Similarly, the result directory needs to replace the tests/
|
||||
# part of the test location.
|
||||
group=`dirname $seq`
|
||||
if $OPTIONS_HAVE_SECTIONS; then
|
||||
export RESULT_DIR=`echo $group | sed -e "s;$SRC_DIR;${RESULT_BASE}/$section;"`
|
||||
REPORT_DIR="$RESULT_BASE/$section"
|
||||
else
|
||||
export RESULT_DIR=`echo $group | sed -e "s;$SRC_DIR;$RESULT_BASE;"`
|
||||
REPORT_DIR="$RESULT_BASE"
|
||||
fi
|
||||
seqres="$REPORT_DIR/$seqnum"
|
||||
|
||||
echo -n "$seqnum"
|
||||
mkdir -p $RESULT_DIR
|
||||
echo -n "$seqnum"
|
||||
|
||||
if $showme; then
|
||||
_expunge_test $seqnum
|
||||
if [ $? -eq 1 ]; then
|
||||
if $showme; then
|
||||
_expunge_test $seqnum
|
||||
if [ $? -eq 1 ]; then
|
||||
tc_status="expunge"
|
||||
continue
|
||||
fi
|
||||
echo
|
||||
start=0
|
||||
stop=0
|
||||
tc_status="list"
|
||||
n_notrun=`expr $n_notrun + 1`
|
||||
continue
|
||||
fi
|
||||
echo
|
||||
start=0
|
||||
stop=0
|
||||
n_notrun=`expr $n_notrun + 1`
|
||||
if $do_report; then
|
||||
_make_testcase_report "list"
|
||||
|
||||
tc_status="pass"
|
||||
if [ ! -f $seq ]; then
|
||||
echo " - no such test?"
|
||||
continue
|
||||
fi
|
||||
continue
|
||||
fi
|
||||
tc_status="pass"
|
||||
if [ ! -f $seq ]; then
|
||||
echo " - no such test?"
|
||||
else
|
||||
|
||||
# really going to try and run this one
|
||||
#
|
||||
rm -f $seqres.out.bad
|
||||
|
||||
# check if we really should run it
|
||||
_expunge_test $seqnum
|
||||
if [ $? -eq 1 ]; then
|
||||
tc_status="expunge"
|
||||
continue
|
||||
fi
|
||||
|
||||
# record that we really tried to run this test.
|
||||
try="$try $seqnum"
|
||||
n_try=`expr $n_try + 1`
|
||||
|
||||
# slashes now in names, sed barfs on them so use grep
|
||||
lasttime=`grep -w ^$seqnum $check.time | awk '// {print $2}'`
|
||||
if [ "X$lasttime" != X ]; then
|
||||
echo -n " ${lasttime}s ..."
|
||||
echo -n " ${lasttime}s ... "
|
||||
else
|
||||
echo -n " " # prettier output with timestamps.
|
||||
echo -n " " # prettier output with timestamps.
|
||||
fi
|
||||
rm -f core $seqres.notrun
|
||||
|
||||
@@ -729,90 +752,87 @@ for section in $HOST_OPTIONS_SECTIONS; do
|
||||
./$seq >$tmp.out 2>&1
|
||||
sts=$?
|
||||
fi
|
||||
|
||||
if [ -f core ]; then
|
||||
_dump_err_cont "[dumped core]"
|
||||
mv core $RESULT_BASE/$seqnum.core
|
||||
err=true
|
||||
fi
|
||||
|
||||
if [ -f $seqres.notrun ]; then
|
||||
$timestamp && _timestamp
|
||||
stop=`_wallclock`
|
||||
$timestamp || echo -n "[not run] "
|
||||
$timestamp && echo " [not run]" && \
|
||||
echo -n " $seqnum -- "
|
||||
cat $seqres.notrun
|
||||
notrun="$notrun $seqnum"
|
||||
n_notrun=`expr $n_notrun + 1`
|
||||
tc_status="notrun"
|
||||
continue;
|
||||
fi
|
||||
|
||||
if [ $sts -ne 0 ]; then
|
||||
_dump_err_cont "[failed, exit status $sts]"
|
||||
_test_unmount 2> /dev/null
|
||||
_scratch_unmount 2> /dev/null
|
||||
err=true
|
||||
else
|
||||
# the test apparently passed, so check for corruption
|
||||
# and log messages that shouldn't be there.
|
||||
_check_filesystems
|
||||
_check_dmesg || err=true
|
||||
_check_kmemleak || err=true
|
||||
fi
|
||||
|
||||
# test ends after all checks are done.
|
||||
$timestamp && _timestamp
|
||||
stop=`_wallclock`
|
||||
|
||||
if [ -f core ]
|
||||
then
|
||||
_err_msg="[dumped core]"
|
||||
echo -n " $_err_msg"
|
||||
mv core $RESULT_BASE/$seqnum.core
|
||||
err=true
|
||||
fi
|
||||
|
||||
if [ -f $seqres.notrun ]
|
||||
then
|
||||
$timestamp || echo -n " [not run] "
|
||||
$timestamp && echo " [not run]" && echo -n " $seqnum -- "
|
||||
cat $seqres.notrun
|
||||
notrun="$notrun $seqnum"
|
||||
n_notrun=`expr $n_notrun + 1`
|
||||
tc_status="notrun"
|
||||
else
|
||||
if [ $sts -ne 0 ]
|
||||
then
|
||||
_err_msg="[failed, exit status $sts]"
|
||||
echo -n " $_err_msg"
|
||||
err=true
|
||||
fi
|
||||
if [ ! -f $seq.out ]
|
||||
then
|
||||
if [ ! -f $seq.out ]; then
|
||||
_dump_err "no qualified output"
|
||||
err=true
|
||||
else
|
||||
|
||||
# coreutils 8.16+ changed quote formats in error messages from
|
||||
# `foo' to 'foo'. Filter old versions to match the new version.
|
||||
sed -i "s/\`/\'/g" $tmp.out
|
||||
if diff $seq.out $tmp.out >/dev/null 2>&1
|
||||
then
|
||||
if $err
|
||||
then
|
||||
:
|
||||
else
|
||||
echo "$seqnum `expr $stop - $start`" >>$tmp.time
|
||||
echo -n " `expr $stop - $start`s"
|
||||
fi
|
||||
echo ""
|
||||
else
|
||||
echo " - output mismatch (see $seqres.out.bad)"
|
||||
mv $tmp.out $seqres.out.bad
|
||||
$diff $seq.out $seqres.out.bad | {
|
||||
if test "$DIFF_LENGTH" -le 0; then
|
||||
cat
|
||||
else
|
||||
head -n "$DIFF_LENGTH"
|
||||
echo "..."
|
||||
echo "(Run '$diff $seq.out $seqres.out.bad'" \
|
||||
" to see the entire diff)"
|
||||
fi; } | \
|
||||
sed -e 's/^\(.\)/ \1/'
|
||||
_err_msg="output mismatch (see $diff $seq.out $seqres.out.bad)"
|
||||
err=true
|
||||
fi
|
||||
fi
|
||||
try="$try $seqnum"
|
||||
n_try=`expr $n_try + 1`
|
||||
_check_filesystems
|
||||
_check_dmesg || err=true
|
||||
_check_kmemleak || err=true
|
||||
continue;
|
||||
fi
|
||||
|
||||
fi
|
||||
# coreutils 8.16+ changed quote formats in error messages
|
||||
# from `foo' to 'foo'. Filter old versions to match the new
|
||||
# version.
|
||||
sed -i "s/\`/\'/g" $tmp.out
|
||||
if diff $seq.out $tmp.out >/dev/null 2>&1 ; then
|
||||
if ! $err ; then
|
||||
echo "$seqnum `expr $stop - $start`" >>$tmp.time
|
||||
echo -n " `expr $stop - $start`s"
|
||||
fi
|
||||
echo ""
|
||||
else
|
||||
_dump_err "- output mismatch (see $seqres.out.bad)"
|
||||
mv $tmp.out $seqres.out.bad
|
||||
$diff $seq.out $seqres.out.bad | {
|
||||
if test "$DIFF_LENGTH" -le 0; then
|
||||
cat
|
||||
else
|
||||
head -n "$DIFF_LENGTH"
|
||||
echo "..."
|
||||
echo "(Run '$diff $seq.out $seqres.out.bad'" \
|
||||
" to see the entire diff)"
|
||||
fi; } | sed -e 's/^\(.\)/ \1/'
|
||||
err=true
|
||||
fi
|
||||
done
|
||||
|
||||
# come here for each test, except when $showme is true
|
||||
#
|
||||
if $err
|
||||
then
|
||||
# make sure we record the status of the last test we ran.
|
||||
if $err ; then
|
||||
bad="$bad $seqnum"
|
||||
n_bad=`expr $n_bad + 1`
|
||||
tc_status="fail"
|
||||
fi
|
||||
if $do_report; then
|
||||
_make_testcase_report "$tc_status"
|
||||
fi
|
||||
seq="after_$seqnum"
|
||||
done
|
||||
fi
|
||||
if $do_report && ! $first_test ; then
|
||||
if [ $tc_status != "expunge" ] ; then
|
||||
_make_testcase_report "$prev_seq" "$tc_status"
|
||||
fi
|
||||
fi
|
||||
|
||||
sect_stop=`_wallclock`
|
||||
interrupt=false
|
||||
_wrapup
|
||||
|
||||
@@ -107,6 +107,12 @@ _dump_err()
|
||||
echo "$_err_msg"
|
||||
}
|
||||
|
||||
_dump_err_cont()
|
||||
{
|
||||
_err_msg="$*"
|
||||
echo -n "$_err_msg"
|
||||
}
|
||||
|
||||
_dump_err2()
|
||||
{
|
||||
_err_msg="$*"
|
||||
|
||||
+8
-6
@@ -77,10 +77,11 @@ _xunit_make_section_report()
|
||||
|
||||
_xunit_make_testcase_report()
|
||||
{
|
||||
local test_status="$1"
|
||||
local test_seq="$1"
|
||||
local test_status="$2"
|
||||
local test_time=`expr $stop - $start`
|
||||
local strip="$SRC_DIR/"
|
||||
local test_name=${seq#$strip}
|
||||
local test_name=${test_seq#$strip}
|
||||
local sect_name=$section
|
||||
|
||||
# TODO: other places may also win if no-section mode will be named like 'default/global'
|
||||
@@ -126,13 +127,13 @@ _xunit_make_testcase_report()
|
||||
elif [ -s $seqres.out.bad ]; then
|
||||
echo -e "\t\t<system-err>" >> $report
|
||||
printf '<![CDATA[\n' >>$report
|
||||
$diff $seq.out $seqres.out.bad | encode_xml >>$report
|
||||
$diff $test_seq.out $seqres.out.bad | encode_xml >>$report
|
||||
printf ']]>\n' >>$report
|
||||
echo -e "\t\t</system-err>" >> $report
|
||||
fi
|
||||
;;
|
||||
*)
|
||||
echo -e "\t\t<failure message=\"Unknown ret_state=$ret_state\" type=\"TestFail\"/>" >> $report
|
||||
echo -e "\t\t<failure message=\"Unknown test_status=$test_status\" type=\"TestFail\"/>" >> $report
|
||||
;;
|
||||
esac
|
||||
echo -e "\t</testcase>" >> $report
|
||||
@@ -157,11 +158,12 @@ _make_section_report()
|
||||
|
||||
_make_testcase_report()
|
||||
{
|
||||
test_status="$1"
|
||||
local test_seq="$1"
|
||||
local test_status="$2"
|
||||
for report in $REPORT_LIST; do
|
||||
case "$report" in
|
||||
"xunit")
|
||||
_xunit_make_testcase_report "$test_status"
|
||||
_xunit_make_testcase_report "$test_seq" "$test_status"
|
||||
;;
|
||||
*)
|
||||
_dump_err "report format '$report' is not supported"
|
||||
|
||||
Reference in New Issue
Block a user