Hash :
eaac33fe
Author :
Date :
2011-07-01T11:12:31
parallel-tests: simplify testsuite summary Prefer a more deterministic, "tabular" format for the testsuite summary, always listing the numbers of passed, failed, xfailed, xpassed, skipped and errored tests, even when these numbers are zero. This simplify the logic of testsuite summary creation, makes it more easily machine-parseable, and will probably allow for easier addition of new kinds of test results in the future. * lib/am/check.am (am__tty_colors_dummy): New make variable, to reduce code duplication. Extracted from previous versions of $(am__tty_colors), and extended by defining two new variables `$mgn' and `$brg'. [%?COLOR%, %!?COLOR%] (am__tty_colors): Use that new variable. (am__text_box): Delete, is not needed anymore. ($(TEST_SUITE_LOG)): Rewrite associated rules to implement the new testsuite summary format. * NEWS: Update. * tests/check10.test: Don't run with the parallel-tests harness too, that makes no sense anymore. * tests/color.test: Update and adjust. * tests/color2.test: Likewise. * tests/parallel-tests.test: Likewise. * tests/parallel-tests3.test: Likewise. * tests/parallel-tests6.test: Likewise. * tests/parallel-tests9.test: Likewise. * tests/parallel-tests-unreadable-log.test: Likewise. * tests/parallel-tests-empty-testlogs.test: Likewise. * tests/parallel-tests-log-override-recheck.test: Likewise. * tests/parallel-tests-no-spurious-summary.test: Likewise. * tests/test-driver-custom-multitest.test: Likewise. * tests/test-driver-end-test-results.test: Likewise. * tests/parallel-tests-no-color-in-log.test: New test. * tests/testsuite-summary-color.test: Likewise. * tests/testsuite-summary-count.test: Likewise. * tests/testsuite-summary-count-many.test: Likewise. * tests/testsuite-summary-reference-log.test: Likewise. * tests/testsuite-summary-checks.sh: New auxiliary script, used by the new tests above. * tests/extract-testsuite-summary: Likewise. * tests/trivial-test-driver: Optimize for speed when there are lots of of tests. * tests/Makefile.am (EXTRA_DIST): Distribute them. (testsuite-summary-color.log, testsuite-summary-count.log): Depend on them. (testsuite-summary-count-many.log): Depend on the auxiliary scripts 'trivial-test-driver' and 'extract-testsuite-summary'. (TESTS): Update.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176
#! /bin/sh
# Copyright (C) 2011 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, see <http://www.gnu.org/licenses/>.
# Check test counts in the testsuite summary.
. ./defs-static || Exit 1
use_colors=no
use_vpath=no
. "$testsrcdir"/testsuite-summary-checks.sh || Exit 99
seq_ ()
{
case $# in
2) l=$1 u=$2;;
*) fatal_ "incorrect usage of 'seq_' function";;
esac
seq $1 $2 || {
i=$l
while test $i -le $u; do
echo $i
i=`expr $i + 1`
done
}
}
./configure
header="\
${br}
Testsuite summary for GNU AutoFoo 7.1
${br}"
success_footer=${br}
failure_footer="\
${br}
See ./test-suite.log
Please report to bug-automake@gnu.org
${br}"
# Corner cases.
do_check '' <<END
$header
# TOTAL: 0
# PASS: 0
# SKIP: 0
# XFAIL: 0
# FAIL: 0
# XPASS: 0
# ERROR: 0
$success_footer
END
do_check pass.t <<END
$header
# TOTAL: 1
# PASS: 1
# SKIP: 0
# XFAIL: 0
# FAIL: 0
# XPASS: 0
# ERROR: 0
$success_footer
END
do_check fail.t <<END
$header
# TOTAL: 1
# PASS: 0
# SKIP: 0
# XFAIL: 0
# FAIL: 1
# XPASS: 0
# ERROR: 0
$failure_footer
END
# Some simpler checks, with low or moderate number of tests.
do_check skip.t skip2.t skip3.t xfail.t xfail2.t <<END
$header
# TOTAL: 5
# PASS: 0
# SKIP: 3
# XFAIL: 2
# FAIL: 0
# XPASS: 0
# ERROR: 0
$success_footer
END
do_check pass.t pass2.t xfail.t xpass.t error.t error2.t <<END
$header
# TOTAL: 6
# PASS: 2
# SKIP: 0
# XFAIL: 1
# FAIL: 0
# XPASS: 1
# ERROR: 2
$failure_footer
END
pass_count=22
skip_count=19
xfail_count=21
fail_count=18
xpass_count=23
error_count=17
tests_count=120
pass=` seq_ 1 $pass_count | sed 's/.*/pass-&.t/'`
skip=` seq_ 1 $skip_count | sed 's/.*/skip-&.t/'`
xfail=`seq_ 1 $xfail_count | sed 's/.*/xfail-&.t/'`
fail=` seq_ 1 $fail_count | sed 's/.*/fail-&.t/'`
xpass=`seq_ 1 $xpass_count | sed 's/.*/xpass-&.t/'`
error=`seq_ 1 $error_count | sed 's/.*/error-&.t/'`
do_check $pass $skip $xfail $fail $xpass $error <<END
$header
# TOTAL: $tests_count
# PASS: $pass_count
# SKIP: $skip_count
# XFAIL: $xfail_count
# FAIL: $fail_count
# XPASS: $xpass_count
# ERROR: $error_count
$failure_footer
END
# Mild stress test with a lot of test scripts.
tests_count=1888
pass_count=1403
skip_count=292
xfail_count=41
fail_count=126
xpass_count=17
error_count=9
pass=` seq_ 1 $pass_count | sed 's/.*/pass-&.t/'`
skip=` seq_ 1 $skip_count | sed 's/.*/skip-&.t/'`
xfail=`seq_ 1 $xfail_count | sed 's/.*/xfail-&.t/'`
fail=` seq_ 1 $fail_count | sed 's/.*/fail-&.t/'`
xpass=`seq_ 1 $xpass_count | sed 's/.*/xpass-&.t/'`
error=`seq_ 1 $error_count | sed 's/.*/error-&.t/'`
do_check $pass $skip $xfail $fail $xpass $error <<END
$header
# TOTAL: $tests_count
# PASS: $pass_count
# SKIP: $skip_count
# XFAIL: $xfail_count
# FAIL: $fail_count
# XPASS: $xpass_count
# ERROR: $error_count
$failure_footer
END
: