configure: Remove --enable-test-coverage

We provide a custom configure option --enable-test-coverage and
'make cov' target to generate code coverage reports. However gnulib
already provides a 'make coverage' which 'just works' and doesn't
require a special configure option.

This drops our custom implementation in favor of 'make coverage'.
Reports are now output to cov/index.html

Reviewed-by: Martin Kletzander <mkletzan@redhat.com>
Signed-off-by: Cole Robinson <crobinso@redhat.com>

diff --git a/Makefile.am b/Makefile.am
index 709064c6a63ea185cc18b639fe3782159b6cad21..3c06e2619a1d045df04e4245c1a55e140724fdaa 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,15 +16,15 @@
 ## License along with this library.  If not, see
 ## <http://www.gnu.org/licenses/>.
 
-LCOV = lcov
-GENHTML = genhtml
-
 SUBDIRS = . gnulib/lib include/libvirt src tools docs gnulib/tests \
   tests po examples
 
 XZ_OPT ?= -v -T0
 export XZ_OPT
 
+# have gnulib 'make coverage' output to 'cov' dir
+COVERAGE_OUT = "cov"
+
 ACLOCAL_AMFLAGS = -I m4
 
 EXTRA_DIST = \
@@ -77,20 +77,6 @@ check-local: all tests
 check-access:
        @($(MAKE) $(AM_MAKEFLAGS) -C tests check-access)
 
-cov: clean-cov
-       $(MKDIR_P) $(top_builddir)/coverage
-       $(LCOV) -c -o $(top_builddir)/coverage/libvirt.info.tmp \
-         -d $(top_builddir)/src \
-         -d $(top_builddir)/tests
-       $(LCOV) -r $(top_builddir)/coverage/libvirt.info.tmp \
-         -o $(top_builddir)/coverage/libvirt.info
-       rm $(top_builddir)/coverage/libvirt.info.tmp
-       $(GENHTML) --show-details -t "libvirt" -o $(top_builddir)/coverage \
-         --legend $(top_builddir)/coverage/libvirt.info
-
-clean-cov:
-       rm -rf $(top_builddir)/coverage
-
 MAINTAINERCLEANFILES = .git-module-status
 
 dist-hook: gen-ChangeLog gen-AUTHORS

diff --git a/configure.ac b/configure.ac
index 197d9746b27e304913a79b64cb14533027e3d2e6..880a3a7e40574b2e2274dbf3359f7f5a55327d43 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -738,23 +738,6 @@ fi
 AC_SUBST([VIR_TEST_EXPENSIVE_DEFAULT])
 AM_CONDITIONAL([WITH_EXPENSIVE_TESTS], [test $VIR_TEST_EXPENSIVE_DEFAULT = 1])
 
-LIBVIRT_ARG_ENABLE([TEST_COVERAGE], [turn on code coverage instrumentation], [no])
-case "$enable_test_coverage" in
-  yes|no) ;;
-  *) AC_MSG_ERROR([bad value ${enable_test_coverga} for test-coverage option]) ;;
-esac
-
-if test "$enable_test_coverage" = yes; then
-  save_WARN_CFLAGS=$WARN_CFLAGS
-  WARN_CFLAGS=
-  gl_WARN_ADD([-fprofile-arcs])
-  gl_WARN_ADD([-ftest-coverage])
-  COVERAGE_FLAGS=$WARN_CFLAGS
-  AC_SUBST([COVERAGE_CFLAGS], [$COVERAGE_FLAGS])
-  AC_SUBST([COVERAGE_LDFLAGS], [$COVERAGE_FLAGS])
-  WARN_CFLAGS=$save_WARN_CFLAGS
-fi
-
 LIBVIRT_ARG_ENABLE([TEST_OOM], [memory allocation failure checking], [no])
 case "$enable_test_oom" in
   yes|no) ;;
@@ -1041,7 +1024,6 @@ LIBVIRT_WIN_RESULT_WINDRES
 AC_MSG_NOTICE([])
 AC_MSG_NOTICE([Test suite])
 AC_MSG_NOTICE([])
-AC_MSG_NOTICE([         Coverage: $enable_test_coverage])
 AC_MSG_NOTICE([        Alloc OOM: $enable_test_oom])
 AC_MSG_NOTICE([])
 AC_MSG_NOTICE([Miscellaneous])

diff --git a/examples/Makefile.am b/examples/Makefile.am
index e2ec6e7fba516d6ea0164795e688c07a64486b47..b590a148ceaac12cb8eee47071d3e5f214bc0832 100644 (file)
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -29,7 +29,7 @@ EXTRA_DIST = \
 
 AM_CPPFLAGS = \
        -I$(top_builddir)/include -I$(top_srcdir)/include -I$(top_srcdir)
-LDADD = $(STATIC_BINARIES) $(WARN_CFLAGS) $(COVERAGE_LDFLAGS) \
+LDADD = $(STATIC_BINARIES) $(WARN_CFLAGS) \
        $(top_builddir)/src/libvirt.la \
        $(top_builddir)/src/libvirt-admin.la
 

diff --git a/src/Makefile.am b/src/Makefile.am
index 4294bd1c6c68c543b53ebaa1ba3a6490f2e05094..5dc9990c17f1d7371f26e840b8e0f6d481f44582 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -37,9 +37,8 @@ AM_CFLAGS =   $(LIBXML_CFLAGS) \
                $(WARN_CFLAGS) \
                $(LOCK_CHECKING_CFLAGS) \
                $(WIN32_EXTRA_CFLAGS) \
-               $(COVERAGE_CFLAGS)
+               $(NULL)
 AM_LDFLAGS =   $(DRIVER_MODULES_LDFLAGS) \
-               $(COVERAGE_LDFLAGS) \
                $(RELRO_LDFLAGS) \
                $(NO_INDIRECT_LDFLAGS) \
                $(CYGWIN_EXTRA_LDFLAGS) \

diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am
index 3d0ff2954821ac8e54fc4da419bd3dd70cf32ab2..468a3f5d973cd8ec6c89def8d13d8fb9cc404ee0 100644 (file)
--- a/src/remote/Makefile.inc.am
+++ b/src/remote/Makefile.inc.am
@@ -136,7 +136,6 @@ libvirtd_CFLAGS = \
        $(LIBNL_CFLAGS) \
        $(WARN_CFLAGS) \
        $(PIE_CFLAGS) \
-       $(COVERAGE_CFLAGS) \
        -I$(srcdir)/access \
        -I$(srcdir)/conf \
        -I$(srcdir)/rpc \
@@ -145,7 +144,6 @@ libvirtd_CFLAGS = \
 libvirtd_LDFLAGS = \
        $(RELRO_LDFLAGS) \
        $(PIE_LDFLAGS) \
-       $(COVERAGE_LDFLAGS) \
        $(NO_INDIRECT_LDFLAGS) \
        $(NO_UNDEFINED_LDFLAGS) \
        $(NULL)

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 7ce327c9e8ea3d4591a172594bbab7c5965b6776..29f1fe2d2afaee14aa36aba232eee42fce4e5edc 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -41,7 +41,6 @@ AM_CFLAGS = \
        $(SELINUX_CFLAGS) \
        $(APPARMOR_CFLAGS) \
        $(YAJL_CFLAGS) \
-       $(COVERAGE_CFLAGS) \
        $(XDR_CFLAGS) \
        $(WARN_CFLAGS)
 
@@ -266,7 +265,6 @@ endif WITH_SECDRIVER_SELINUX
 
 # This is a fake SSH we use from virnetsockettest
 ssh_SOURCES = ssh.c
-ssh_LDADD = $(COVERAGE_LDFLAGS)
 
 if WITH_LIBXL
 test_programs += xlconfigtest xml2sexprtest sexpr2xmltest \

diff --git a/tools/Makefile.am b/tools/Makefile.am
index f2f84f78529f1e98277476b43fd58ec8f131b965..95025ced43450decda7773afdcfd99952c38f23f 100644 (file)
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -27,7 +27,6 @@ WARN_CFLAGS += $(STRICT_FRAME_LIMIT_CFLAGS)
 
 AM_CFLAGS = \
        $(WARN_CFLAGS) \
-       $(COVERAGE_CFLAGS) \
        $(PIE_CFLAGS) \
        $(LIBXML_CFLAGS) \
        $(NULL)
@@ -137,7 +136,6 @@ libvirt_shell_la_CFLAGS = \
 libvirt_shell_la_LDFLAGS = \
                $(AM_LDFLAGS) \
                $(PIE_LDFLAGS) \
-               $(COVERAGE_LDFLAGS) \
                $(NULL)
 libvirt_shell_la_LIBADD = \
                ../src/libvirt.la \
@@ -183,7 +181,6 @@ endif ! WITH_BHYVE
 virt_host_validate_LDFLAGS = \
                $(AM_LDFLAGS) \
                $(PIE_LDFLAGS) \
-               $(COVERAGE_LDFLAGS) \
                $(NULL)
 
 virt_host_validate_LDADD = \
@@ -206,7 +203,6 @@ virt_login_shell_SOURCES = \
 virt_login_shell_LDFLAGS = \
                $(AM_LDFLAGS) \
                $(PIE_LDFLAGS) \
-               $(COVERAGE_LDFLAGS) \
                $(NULL)
 virt_login_shell_LDADD = \
                $(STATIC_BINARIES) \
@@ -239,7 +235,6 @@ virsh_SOURCES = \
 virsh_LDFLAGS = \
                $(AM_LDFLAGS) \
                $(PIE_LDFLAGS) \
-               $(COVERAGE_LDFLAGS) \
                $(NULL)
 virsh_LDADD = \
                $(STATIC_BINARIES) \
@@ -257,7 +252,6 @@ virt_admin_SOURCES = \
 
 virt_admin_LDFLAGS = \
                $(AM_LDFLAGS) \
-               $(COVERAGE_LDFLAGS) \
                $(STATIC_BINARIES) \
                $(PIE_LDFLAGS) \
                $(NULL)