+Tue Feb 13 19:46:35 EST 2007 Daniel Berrange <berrange@redhat.com>
+
+ * autobuild.sh: Run coverage tests during automated build
+ * autogen.sh: Point aclocal at m4 directory explicitly
+ * configure.in: Added command line arg to enable coverage
+ * Makefile.am: Added scripts directory
+ * src/Makefile.am: Build with coverage testing if requested
+ and add target for extracting coverage data
+ * scripts/*: Helper tools for coverage testing
+ * tests/Makefile.am: Make tests link to object files instad
+ of the static library to ensure single output dest for
+ coverage data when running tests
+
Tue Feb 13 19:29:35 EST 2007 Daniel Berrange <berrange@redhat.com>
* src/qemu_internal.h, src/qemu_internal.c, src/Makefile.am,
## Process this file with automake to produce Makefile.in
-SUBDIRS = src qemud proxy include docs @PYTHON_SUBDIR@ tests po
+SUBDIRS = src qemud proxy include docs @PYTHON_SUBDIR@ tests po scripts
ACLOCAL_AMFLAGS = -I m4
tests:
@(cd docs/examples ; $(MAKE) MAKEFLAGS+=--silent tests)
@(if [ "@PYTHON_SUBDIR@" != "" ] ; then cd python ; \
- $(MAKE) MAKEFLAGS+=--silent tests ; fi)
+ $(MAKE) MAKEFLAGS+=--silent tests ; fi)
+
+cov: cov-recursive cov-am
+
+clean-cov:
+ rm -rf $(top_builddir)/coverage
+ cd src && $(MAKE) $(AM_MAKEFLAGS) clean-cov
+
+cov-recursive:
+ cd src && $(MAKE) $(AM_MAKEFLAGS) cov
+
+cov-am:
+ rm -rf $(top_builddir)/coverage
+ mkdir $(top_builddir)/coverage
+ perl $(srcdir)/scripts/coverage-report.pl src/*.cov > $(top_builddir)/coverage/index.xml
+ xsltproc $(srcdir)/scripts/coverage-report.xsl \
+ $(top_builddir)/coverage/index.xml \
+ > $(top_builddir)/coverage/index.html
+ for i in $(top_builddir)/src/*.gcov ; do o=`echo $$i | sed -e 's,$(top_builddir)/src,coverage,'` ; \
+ perl $(srcdir)/scripts/coverage-report-entry.pl $$i > $$o.html ; done
#!/bin/sh
set -e
+set -v
# Make things clean.
test -n "$1" && RESULTS="$1" || RESULTS="results.log"
test -f Makefile && make -k distclean || :
-rm -rf MANIFEST blib
+rm -rf coverage
#rm -rf build
#mkdir build
#cd build
-./autogen.sh --prefix=$AUTOBUILD_INSTALL_ROOT
+./autogen.sh --prefix=$AUTOBUILD_INSTALL_ROOT --enable-test-coverage
make
make install
-make check 1>$RESULTS 2>&1
-#make cov
+make check 2>&1 | tee $RESULTS
+make cov
rm -f *.tar.gz
make dist
autopoint --force
#rm -rf m4
libtoolize --copy --force
-aclocal $ACLOCAL_FLAGS
+aclocal -I m4
automake --add-missing
autoconf
AM_CONDITIONAL(ENABLE_XEN_TESTS, [test "$RUNNING_XEN" != "no" -a "$RUNNING_XEND" != "no"])
+AC_ARG_ENABLE(test-coverage,
+[ --enable-test-coverage turn on code coverage instrumentation],
+[case "${enableval}" in
+ yes|no) ;;
+ *) AC_MSG_ERROR([bad value ${enableval} for test-coverage option]) ;;
+ esac],
+ [enableval=no])
+
+if test "${enableval}" = yes; then
+ gl_COMPILER_FLAGS(-fprofile-arcs)
+ gl_COMPILER_FLAGS(-ftest-coverage)
+ AC_SUBST([COVERAGE_CFLAGS], [$COMPILER_FLAGS])
+ AC_SUBST([COVERAGE_LDFLAGS], [$COMPILER_FLAGS])
+ COMPILER_FLAGS=
+fi
+
+
AM_GNU_GETTEXT_VERSION([0.14.1])
AM_GNU_GETTEXT([external])
if test -d po
docs/examples/Makefile docs/devhelp/Makefile \
docs/examples/python/Makefile \
libvirt.pc libvirt.spec \
- po/Makefile.in \
+ po/Makefile.in scripts/Makefile \
include/libvirt/Makefile include/libvirt/libvirt.h \
python/Makefile python/tests/Makefile \
qemud/Makefile \
--- /dev/null
+Makefile
+Makefile.in
--- /dev/null
+
+EXTRA_DIST = coverage-report.pl \
+ coverage-report-entry.pl \
+ coverage-report.xsl
--- /dev/null
+This directory provides a collection of tools used in the
+build / test process. They are not installed / used after
+deployment.
--- /dev/null
+#!/usr/bin/perl
+#
+# Copyright (C) 2006-2007 Daniel P. Berrange
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library 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
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+# Author: Daniel P. Berrange <berrange@redhat.com>
+#
+# coverage-report-entry.pl: convert gcov annotated source into HTML
+#
+# This script takes a gcov annotated source code files on STDIN
+# converts it to HTML, coloured according to coverage, and sends
+# it to STDOUT
+
+print <<EOF;
+<html>
+<head>
+<title>Coverage report for $ARGV[0]</title>
+<style type="text/css">
+ span.perfect {
+ background: rgb(0,255,0);
+ }
+ span.terrible {
+ background: rgb(255,0,0);
+ }
+</style>
+</head>
+<body>
+<h1>Coverage report for $ARGV[0]</h1>
+
+<pre>
+EOF
+
+
+while (<>) {
+ s/&/&/g;
+ s/</</g;
+ s/>/>/g;
+
+ if (/^\s*function (\S+) called (\d+) returned \d+% blocks executed \d+%/) {
+ my $class = $2 > 0 ? "perfect" : "terrible";
+ $_ = "<span class=\"$class\" id=\"" . $1 . "\">$_</span>";
+ } elsif (/^\s*branch\s+\d+\s+taken\s+(\d+)%\s+.*$/) {
+ my $class = $1 > 0 ? "perfect" : "terrible";
+ $_ = "<span class=\"$class\">$_</span>";
+ } elsif (/^\s*branch\s+\d+\s+never executed.*$/) {
+ my $class = "terrible";
+ $_ = "<span class=\"$class\">$_</span>";
+ } elsif (/^\s*call\s+\d+\s+never executed.*$/) {
+ my $class = "terrible";
+ $_ = "<span class=\"$class\">$_</span>";
+ } elsif (/^\s*call\s+\d+\s+returned\s+(\d+)%.*$/) {
+ my $class = $1 > 0 ? "perfect" : "terrible";
+ $_ = "<span class=\"$class\">$_</span>";
+ }
+
+
+ print;
+}
+
+print <<EOF;
+</pre>
+</body>
+</html>
+EOF
--- /dev/null
+#!/usr/bin/perl
+#
+# Copyright (C) 2006-2007 Daniel P. Berrange
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library 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
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+# Author: Daniel P. Berrange <berrange@redhat.com>
+#
+# coverage-report.pl: generate XML coverage summary report
+#
+# This script takes a listof gcov .cov files as args, and generates
+# an XML document summarizing the coverage per function and per
+# source file.
+
+use warnings;
+use strict;
+
+my %coverage = ( functions => {}, files => {} );
+
+my %filemap;
+
+my $type;
+my $name;
+
+my @functions;
+
+while (<>) {
+ if (/^Function '(.*)'\s*$/) {
+ $type = "function";
+ $name = $1;
+ $coverage{$type}->{$name} = {};
+ push @functions, $name;
+ } elsif (/^File '(.*?)'\s*$/) {
+ $type = "file";
+ $name = $1;
+ $coverage{$type}->{$name} = {};
+
+ foreach my $func (@functions) {
+ $coverage{"function"}->{$func}->{file} = $name;
+ }
+ @functions = ();
+ } elsif (/^Lines executed:(.*)%\s*of\s*(\d+)\s*$/) {
+ $coverage{$type}->{$name}->{lines} = $2;
+ $coverage{$type}->{$name}->{linesCoverage} = $1;
+ } elsif (/^Branches executed:(.*)%\s*of\s*(\d+)\s*$/) {
+ $coverage{$type}->{$name}->{branches} = $2;
+ $coverage{$type}->{$name}->{branchesCoverage} = $1;
+ } elsif (/^Taken at least once:(.*)%\s*of\s*(\d+)\s*$/) {
+ $coverage{$type}->{$name}->{conds} = $2;
+ $coverage{$type}->{$name}->{condsCoverage} = $1;
+ } elsif (/^Calls executed:(.*)%\s*of\s*(\d+)\s*$/) {
+ $coverage{$type}->{$name}->{calls} = $2;
+ $coverage{$type}->{$name}->{callsCoverage} = $1;
+ } elsif (/^No branches$/) {
+ $coverage{$type}->{$name}->{branches} = 0;
+ $coverage{$type}->{$name}->{branchesCoverage} = "100.00";
+ $coverage{$type}->{$name}->{conds} = 0;
+ $coverage{$type}->{$name}->{condsCoverage} = "100.00";
+ } elsif (/^No calls$/) {
+ $coverage{$type}->{$name}->{calls} = 0;
+ $coverage{$type}->{$name}->{callsCoverage} = "100.00";
+ } elsif (/^\s*(.*):creating '(.*)'\s*$/) {
+ $filemap{$1} = $2;
+ } elsif (/^\s*$/) {
+ # nada
+ } else {
+ warn "unexpected input [$_]\n";
+ }
+}
+
+my %summary;
+foreach my $type ("function", "file") {
+ $summary{$type} = {};
+ foreach my $m ("lines", "branches", "conds", "calls") {
+ my $totalGot = 0;
+ my $totalMiss = 0;
+ my $count = 0;
+ foreach my $func (keys %{$coverage{function}}) {
+ $count++;
+ my $got = $coverage{function}->{$func}->{$m};
+ $totalGot += $got;
+ my $miss = $got * $coverage{function}->{$func}->{$m ."Coverage"} / 100;
+ $totalMiss += $miss;
+ }
+ $summary{$type}->{$m} = sprintf("%d", $totalGot);
+ if ($totalGot == 0) {
+ $summary{$type}->{$m . "Coverage"} = "100.00";
+ } else {
+ $summary{$type}->{$m . "Coverage"} = sprintf("%.2f", $totalMiss / $totalGot * 100);
+ }
+ }
+}
+
+
+
+print "<coverage>\n";
+
+foreach my $type ("function", "file") {
+ printf "<%ss>\n", $type;
+ foreach my $name (sort { $a cmp $b } keys %{$coverage{$type}}) {
+ my $rec = $coverage{$type}->{$name};
+ printf " <entry name=\"%s\" details=\"%s\">\n", $name, ($type eq "file" ? $filemap{$name} : $filemap{$rec->{file}});
+ printf " <lines count=\"%s\" coverage=\"%s\"/>\n", $rec->{lines}, $rec->{linesCoverage};
+ if (exists $rec->{branches}) {
+ printf " <branches count=\"%s\" coverage=\"%s\"/>\n", $rec->{branches}, $rec->{branchesCoverage};
+ }
+ if (exists $rec->{conds}) {
+ printf " <conditions count=\"%s\" coverage=\"%s\"/>\n", $rec->{conds}, $rec->{condsCoverage};
+ }
+ if (exists $rec->{calls}) {
+ printf " <calls count=\"%s\" coverage=\"%s\"/>\n", $rec->{calls}, $rec->{callsCoverage};
+ }
+ print " </entry>\n";
+ }
+
+ printf " <summary>\n";
+ printf " <lines count=\"%s\" coverage=\"%s\"/>\n", $summary{$type}->{lines}, $summary{$type}->{linesCoverage};
+ printf " <branches count=\"%s\" coverage=\"%s\"/>\n", $summary{$type}->{branches}, $summary{$type}->{branchesCoverage};
+ printf " <conditions count=\"%s\" coverage=\"%s\"/>\n", $summary{$type}->{conds}, $summary{$type}->{condsCoverage};
+ printf " <calls count=\"%s\" coverage=\"%s\"/>\n", $summary{$type}->{calls}, $summary{$type}->{callsCoverage};
+ printf " </summary>\n";
+ printf "</%ss>\n", $type;
+}
+
+print "</coverage>\n";
--- /dev/null
+<?xml version="1.0" encoding="utf-8"?>\r
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"\r
+ version="1.0">\r
+\r
+ <xsl:output method="html"/>\r
+\r
+ <xsl:template match="coverage">\r
+ <html>\r
+ <head>\r
+ <title>Coverage report</title>\r
+ <style type="text/css">\r
+ tbody tr.odd td.label {\r
+ border-top: 1px solid rgb(128,128,128);\r
+ border-bottom: 1px solid rgb(128,128,128);\r
+ }\r
+ tbody tr.odd td.label {\r
+ background: rgb(200,200,200);\r
+ }\r
+ \r
+ thead, tfoot {\r
+ background: rgb(60,60,60);\r
+ color: white;\r
+ font-weight: bold;\r
+ }\r
+\r
+ tr td.perfect {\r
+ background: rgb(0,255,0);\r
+ color: black;\r
+ }\r
+ tr td.excellant {\r
+ background: rgb(140,255,140);\r
+ color: black;\r
+ }\r
+ tr td.good {\r
+ background: rgb(160,255,0);\r
+ color: black;\r
+ }\r
+ tr td.poor {\r
+ background: rgb(255,160,0);\r
+ color: black;\r
+ }\r
+ tr td.bad {\r
+ background: rgb(255,140,140);\r
+ color: black;\r
+ }\r
+ tr td.terrible {\r
+ background: rgb(255,0,0);\r
+ color: black;\r
+ }\r
+ </style>\r
+ </head>\r
+ <body>\r
+ <h1>Coverage report</h1>\r
+ <xsl:apply-templates/>\r
+ </body>\r
+ </html>\r
+ </xsl:template>\r
+\r
+ <xsl:template match="functions">\r
+ <h2>Function coverage</h2>\r
+ <xsl:call-template name="content">\r
+ <xsl:with-param name="type" select="'function'"/>\r
+ </xsl:call-template>\r
+ </xsl:template>\r
+ \r
+\r
+ <xsl:template match="files">\r
+ <h2>File coverage</h2>\r
+ <xsl:call-template name="content">\r
+ <xsl:with-param name="type" select="'file'"/>\r
+ </xsl:call-template>\r
+ </xsl:template>\r
+\r
+ <xsl:template name="content">\r
+ <xsl:param name="type"/>\r
+ <table>\r
+ <thead>\r
+ <tr>\r
+ <th>Name</th>\r
+ <th>Lines</th>\r
+ <th>Branches</th>\r
+ <th>Conditions</th>\r
+ <th>Calls</th>\r
+ </tr>\r
+ </thead>\r
+ <tbody>\r
+ <xsl:for-each select="entry">\r
+ <xsl:call-template name="entry">\r
+ <xsl:with-param name="type" select="$type"/>\r
+ <xsl:with-param name="class">\r
+ <xsl:choose>\r
+ <xsl:when test="position() mod 2">\r
+ <xsl:text>odd</xsl:text>\r
+ </xsl:when>\r
+ <xsl:otherwise>\r
+ <xsl:text>even</xsl:text>\r
+ </xsl:otherwise>\r
+ </xsl:choose>\r
+ </xsl:with-param>\r
+ </xsl:call-template>\r
+ </xsl:for-each>\r
+ </tbody>\r
+ <tfoot>\r
+ <xsl:for-each select="summary">\r
+ <xsl:call-template name="entry">\r
+ <xsl:with-param name="type" select="'summary'"/>\r
+ <xsl:with-param name="class">\r
+ <xsl:choose>\r
+ <xsl:when test="position() mod 2">\r
+ <xsl:text>odd</xsl:text>\r
+ </xsl:when>\r
+ <xsl:otherwise>\r
+ <xsl:text>even</xsl:text>\r
+ </xsl:otherwise>\r
+ </xsl:choose>\r
+ </xsl:with-param>\r
+ </xsl:call-template>\r
+ </xsl:for-each>\r
+ </tfoot>\r
+ </table>\r
+ </xsl:template>\r
+ \r
+ <xsl:template name="entry">\r
+ <xsl:param name="type"/>\r
+ <xsl:param name="class"/>\r
+ <tr class="{$class}">\r
+ <xsl:choose>\r
+ <xsl:when test="$type = 'function'">\r
+ <td class="label"><a href="{@details}.html#{@name}"><xsl:value-of select="@name"/></a></td>\r
+ </xsl:when>\r
+ <xsl:when test="$type = 'file'">\r
+ <td class="label"><a href="{@details}.html"><xsl:value-of select="@name"/></a></td>\r
+ </xsl:when>\r
+ <xsl:otherwise>\r
+ <td class="label">Summary</td>\r
+ </xsl:otherwise>\r
+ </xsl:choose>\r
+\r
+ <xsl:if test="count(lines)">\r
+ <xsl:apply-templates select="lines"/>\r
+ </xsl:if>\r
+ <xsl:if test="not(count(lines))">\r
+ <xsl:call-template name="missing"/>\r
+ </xsl:if>\r
+\r
+ <xsl:if test="count(branches)">\r
+ <xsl:apply-templates select="branches"/>\r
+ </xsl:if>\r
+ <xsl:if test="not(count(branches))">\r
+ <xsl:call-template name="missing"/>\r
+ </xsl:if>\r
+\r
+ <xsl:if test="count(conditions)">\r
+ <xsl:apply-templates select="conditions"/>\r
+ </xsl:if>\r
+ <xsl:if test="not(count(conditions))">\r
+ <xsl:call-template name="missing"/>\r
+ </xsl:if>\r
+\r
+ <xsl:if test="count(calls)">\r
+ <xsl:apply-templates select="calls"/>\r
+ </xsl:if>\r
+ <xsl:if test="not(count(calls))">\r
+ <xsl:call-template name="missing"/>\r
+ </xsl:if>\r
+\r
+ </tr>\r
+ </xsl:template>\r
+ \r
+ <xsl:template match="lines">\r
+ <xsl:call-template name="row"/>\r
+ </xsl:template>\r
+\r
+ <xsl:template match="branches">\r
+ <xsl:call-template name="row"/>\r
+ </xsl:template>\r
+\r
+ <xsl:template match="conditions">\r
+ <xsl:call-template name="row"/>\r
+ </xsl:template>\r
+\r
+ <xsl:template match="calls">\r
+ <xsl:call-template name="row"/>\r
+ </xsl:template>\r
+\r
+ <xsl:template name="missing">\r
+ <td></td>\r
+ </xsl:template>\r
+\r
+ <xsl:template name="row">\r
+ <xsl:variable name="quality">\r
+ <xsl:choose>\r
+ <xsl:when test="@coverage = 100">\r
+ <xsl:text>perfect</xsl:text>\r
+ </xsl:when>\r
+ <xsl:when test="@coverage >= 80.0">\r
+ <xsl:text>excellant</xsl:text>\r
+ </xsl:when>\r
+ <xsl:when test="@coverage >= 60.0">\r
+ <xsl:text>good</xsl:text>\r
+ </xsl:when>\r
+ <xsl:when test="@coverage >= 40.0">\r
+ <xsl:text>poor</xsl:text>\r
+ </xsl:when>\r
+ <xsl:when test="@coverage >= 20.0">\r
+ <xsl:text>bad</xsl:text>\r
+ </xsl:when>\r
+ <xsl:otherwise>\r
+ <xsl:text>terrible</xsl:text>\r
+ </xsl:otherwise>\r
+ </xsl:choose>\r
+ </xsl:variable>\r
+ \r
+ <td class="{$quality}"><xsl:value-of select="@coverage"/>% of <xsl:value-of select="@count"/></td>\r
+ </xsl:template>\r
+\r
+</xsl:stylesheet>\r
lib_LTLIBRARIES = libvirt.la
libvirt_la_LIBADD = @LIBXML_LIBS@
libvirt_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libvirt_sym.version \
- -version-info @LIBVIRT_VERSION_INFO@
-
+ -version-info @LIBVIRT_VERSION_INFO@ \
+ $(COVERAGE_CFLAGS:-f%=-Wc,-f%)
+libvirt_la_CFLAGS = $(COVERAGE_CFLAGS)
libvirt_la_SOURCES = \
libvirt.c internal.h \
hash.c hash.h \
bin_PROGRAMS = virsh
virsh_SOURCES = virsh.c console.c console.h
-virsh_LDFLAGS =
+virsh_LDFLAGS = $(COVERAGE_LDFLAGS)
virsh_DEPENDENCIES = $(DEPS)
virsh_LDADD = $(LDADDS) $(VIRSH_LIBS)
+virsh_CFLAGS = $(COVERAGE_CFLAGS)
#
# target to ease building test programs
#
tst: tst.c
$(CC) $(CFLAGS) -I../include -o tst tst.c .libs/libvirt.a -lxml2 -lxenstore -lpthread
+
+COVERAGE_FILES = $(libvirt_la_SOURCES:%.c=libvirt_la-%.cov)
+
+cov: clean-cov $(COVERAGE_FILES)
+
+clean-cov:
+ rm -f *.cov *.gcov
+
+%.cov: .libs/%.o
+ gcov -b -f -o .libs $< > $@
+
+CLEANFILES = *.cov *.gcov .libs/*.gcda .libs/*.gcno *.gcno *.gcda
SUBDIRS = virshdata confdata sexpr2xmldata xml2sexprdata xmconfigdata
-LIBVIRT = $(top_builddir)/src/.libs/libvirt.a
+# Wierd libtool related juju...
+#
+# We explicitly want wildcard here instead of just linking
+# to the libvirt.a file. This ensures that when coverage
+# tests are run, all the output data ends up in the correct
+# location. ie, src/ instead of src/.libs.
+LIBVIRT = $(wildcard $(top_builddir)/src/.libs/*.o)
INCLUDES = \
-I$(top_builddir)/include \
-I$(top_srcdir)/src \
@LIBXML_CFLAGS@ \
-D_XOPEN_SOURCE=600 -D_POSIX_C_SOURCE=199506L \
- -DGETTEXT_PACKAGE=\"$(PACKAGE)\"
+ -DGETTEXT_PACKAGE=\"$(PACKAGE)\" \
+ $(COVERAGE_CFLAGS)
+
LDADDS = \
@STATIC_BINARIES@ \
@LIBXML_LIBS@ \
- $(LIBVIRT)
+ $(LIBVIRT) \
+ $(COVERAGE_LDFLAGS)
EXTRA_DIST = xmlrpcserver.py test_conf.sh
projects / thirdparty / libvirt.git / commitdiff
