From d3c395f4db22f1c9da4bee482dd78bbd2e6622e2 Mon Sep 17 00:00:00 2001 From: Evan Hunt Date: Tue, 1 Nov 2011 18:34:11 +0000 Subject: [PATCH] 3189. [test] Added a summary report after system tests. [RT #25517] --- CHANGES | 2 ++ bin/tests/system/.cvsignore | 1 + bin/tests/system/Makefile.in | 3 ++- bin/tests/system/runall.sh | 23 ++++++++++++++--------- 4 files changed, 19 insertions(+), 10 deletions(-) diff --git a/CHANGES b/CHANGES index 89f0687e02..aec4c84166 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,5 @@ +3189. [test] Added a summary report after system tests. [RT #25517] + 3188. [bug] zone.c:zone_refreshkeys() could fail to detach references correctly when errors occurred, causing a hang on shutdown. [RT #26372] diff --git a/bin/tests/system/.cvsignore b/bin/tests/system/.cvsignore index b3271edb52..ea15748232 100644 --- a/bin/tests/system/.cvsignore +++ b/bin/tests/system/.cvsignore @@ -1,2 +1,3 @@ Makefile conf.sh +systests.output diff --git a/bin/tests/system/Makefile.in b/bin/tests/system/Makefile.in index 79a5729238..2450245a85 100644 --- a/bin/tests/system/Makefile.in +++ b/bin/tests/system/Makefile.in @@ -13,7 +13,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.in,v 1.31.268.2 2010/06/23 23:46:35 tbox Exp $ +# $Id: Makefile.in,v 1.31.268.3 2011/11/01 18:34:11 each Exp $ srcdir = @srcdir@ VPATH = @srcdir@ @@ -36,6 +36,7 @@ test: subdirs testclean clean distclean:: if test -f ./cleanall.sh; then sh ./cleanall.sh; fi + rm -f systests.output distclean:: rm -f conf.sh diff --git a/bin/tests/system/runall.sh b/bin/tests/system/runall.sh index 21e7c19d04..2ce6a9a485 100644 --- a/bin/tests/system/runall.sh +++ b/bin/tests/system/runall.sh @@ -15,7 +15,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: runall.sh,v 1.8.558.2 2010/03/04 23:49:19 tbox Exp $ +# $Id: runall.sh,v 1.8.558.3 2011/11/01 18:34:11 each Exp $ # # Run all the system tests. @@ -26,13 +26,14 @@ SYSTEMTESTTOP=. status=0 -for d in $SUBDIRS -do - sh run.sh $d || status=1 -done +{ + for d in $SUBDIRS + do + sh run.sh $d || status=1 + done -$PERL testsock.pl || { - cat <&2 + $PERL testsock.pl || { + cat <&2 I: I:NOTE: Many of the tests were skipped because they require that I: the IP addresses 10.53.0.1 through 10.53.0.7 are configured @@ -40,7 +41,11 @@ I: as alias addresses on the loopback interface. Please run I: "bin/tests/system/ifconfig.sh up" as root to configure them I: and rerun the tests. EOF - exit 0; -} + exit 0; + } +} | tee "systests.output" + +echo "I:System test result summary:" +grep '^R:' systests.output | sort | uniq -c | sed -e 's/^/I: /' -e 's/R://' exit $status