Add make test code coverage reporting using gcov

Change-Id: Ia8247841fdbe76e1d888aab49ae213b4216af273
Signed-off-by: Juraj Sloboda <jsloboda@cisco.com>

diff --git a/.gitignore b/.gitignore
index cec432c..c12eedf 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -14,6 +14,7 @@
 /build-root/*.rpm
 /build-root/*.changes
 /build-root/test-doc/
+/build-root/test-cov/
 /build-root/python/
 /build-config.mk
 /dpdk/*.tar.gz

diff --git a/Makefile b/Makefile
index 00699a7..5015566 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -33,7 +33,7 @@ endif
 DEB_DEPENDS  = curl build-essential autoconf automake bison libssl-dev ccache
 DEB_DEPENDS += debhelper dkms git libtool libganglia1-dev libapr1-dev dh-systemd
 DEB_DEPENDS += libconfuse-dev git-review exuberant-ctags cscope
-DEB_DEPENDS += python-dev python-virtualenv python-pip
+DEB_DEPENDS += python-dev python-virtualenv python-pip lcov
 ifeq ($(OS_VERSION_ID),14.04)
        DEB_DEPENDS += openjdk-8-jdk-headless
 else
@@ -43,7 +43,7 @@ endif
 RPM_DEPENDS_GROUPS = 'Development Tools'
 RPM_DEPENDS  = redhat-lsb glibc-static java-1.8.0-openjdk-devel yum-utils
 RPM_DEPENDS += openssl-devel https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm apr-devel
-RPM_DEPENDS += python-devel python-virtualenv
+RPM_DEPENDS += python-devel python-virtualenv lcov
 EPEL_DEPENDS = libconfuse-devel ganglia-devel
 
 ifneq ($(wildcard $(STARTUP_DIR)/startup.conf),)
@@ -59,6 +59,7 @@ endif
 .PHONY: run run-release debug debug-release build-vat run-vat pkg-deb pkg-rpm
 .PHONY: ctags cscope plugins plugins-release build-vpp-api
 .PHONY: test test-debug retest retest-debug test-doc test-wipe-doc test-help test-wipe
+.PHONY: test-cov test-wipe-cov
 
 help:
        @echo "Make Targets:"
@@ -97,6 +98,8 @@ help:
        @echo " wipe-doxygen        - wipe all generated documentation"
        @echo " test-doc            - generate documentation for test framework"
        @echo " test-wipe-doc       - wipe documentation for test framework"
+       @echo " test-cov            - generate code coverage report for test framework"
+       @echo " test-wipe-cov       - wipe code coverage report for test framework"
        @echo ""
        @echo "Make Arguments:"
        @echo " V=[0|1]             - set build verbosity level"
@@ -219,6 +222,8 @@ VPP_PYTHON_PREFIX=$(BR)/python
 define test
        $(if $(filter-out $(3),retest),make -C $(BR) PLATFORM=$(1) TAG=$(2) vpp-api-install plugins-install vpp-install,)
        make -C test \
+         BR=$(BR) \
+         VPP_TEST_BUILD_DIR=$(BR)/build-$(2)-native \
          VPP_TEST_BIN=$(BR)/install-$(2)-native/vpp/bin/vpp \
          VPP_TEST_API_TEST_BIN=$(BR)/install-$(2)-native/vpp-api-test/bin/vpp_api_test \
          VPP_TEST_PLUGIN_PATH=$(BR)/install-$(2)-native/plugins/lib64/vpp_plugins \
@@ -245,6 +250,12 @@ test-doc:
 test-wipe-doc:
        @make -C test wipe-doc BR=$(BR)
 
+test-cov:
+       $(call test,vpp_lite,vpp_lite_gcov,cov)
+
+test-wipe-cov:
+       @make -C test wipe-cov BR=$(BR)
+
 retest:
        $(call test,vpp_lite,vpp_lite,retest)
 

diff --git a/build-data/platforms/vpp_lite.mk b/build-data/platforms/vpp_lite.mk
index 94e6951..ef2ec44 100644 (file)
--- a/build-data/platforms/vpp_lite.mk
+++ b/build-data/platforms/vpp_lite.mk
@@ -44,3 +44,8 @@ vpp_lite_TAG_CFLAGS = -g -O2 -DFORTIFY_SOURCE=2 -march=$(MARCH) -mtune=$(MTUNE)
        -fstack-protector -fPIC -Werror
 vpp_lite_TAG_LDFLAGS = -g -O2 -DFORTIFY_SOURCE=2 -march=$(MARCH) -mtune=$(MTUNE) \
        -fstack-protector -fPIC -Werror
+
+vpp_lite_gcov_TAG_CFLAGS = -g -O0 -DCLIB_DEBUG -march=$(MARCH) \
+       -fPIC -Werror -fprofile-arcs -ftest-coverage
+vpp_lite_gcov_TAG_LDFLAGS = -g -O0 -DCLIB_DEBUG -march=$(MARCH) \
+       -fPIC -Werror -coverage

diff --git a/test/Makefile b/test/Makefile
index de6aaa7..7561a00 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -8,6 +8,7 @@ endif
 PYTHON_VENV_PATH=$(VPP_PYTHON_PREFIX)/virtualenv
 PYTHON_DEPENDS=scapy==2.3.3 pexpect
 SCAPY_SOURCE=$(WS_ROOT)/build-root/python/virtualenv/lib/python2.7/site-packages/
+BUILD_COV_DIR = $(BR)/test-cov
 
 
 .pip-install.ok:
@@ -30,11 +31,15 @@ SCAPY_SOURCE=$(WS_ROOT)/build-root/python/virtualenv/lib/python2.7/site-packages
 PHONIES=.install.ok .pip-patch.ok .pip-install.ok
 .PHONY: $(PHONIES)
 
-test: reset verify-python-path .install.ok
+define retest-func
        @bash -c "source $(PYTHON_VENV_PATH)/bin/activate && python run_tests.py discover -p test_$(TEST)\"*.py\""
+endef
+
+test: reset verify-python-path .install.ok
+       $(call retest-func)
 
 retest: reset verify-python-path
-       @bash -c "source $(PYTHON_VENV_PATH)/bin/activate && python run_tests.py discover -p test_$(TEST)\"*.py\""
+       $(call retest-func)
 
 .PHONY: wipe doc
 
@@ -53,6 +58,18 @@ doc: verify-python-path
 wipe-doc:
        @make -C doc wipe BR=$(BR)
 
+cov: wipe-cov reset verify-python-path .install.ok
+       @lcov --zerocounters --directory $(VPP_TEST_BUILD_DIR)
+       $(call retest-func)
+       @mkdir $(BUILD_COV_DIR)
+       @lcov --capture --directory $(VPP_TEST_BUILD_DIR) --output-file $(BUILD_COV_DIR)/coverage.info
+       @genhtml $(BUILD_COV_DIR)/coverage.info --output-directory $(BUILD_COV_DIR)/html
+       @echo
+       @echo "Build finished. Code coverage report is in $(BUILD_COV_DIR)/html/index.html"
+
+wipe-cov: wipe
+       @rm -rf $(BUILD_COV_DIR)
+
 help:
        @echo "Running tests:"
        @echo ""
@@ -60,7 +77,7 @@ help:
        @echo " test-debug          - build and run functional tests (debug build)"
        @echo " retest              - run functional tests"
        @echo " retest-debug        - run functional tests (debug build)"
-       @echo " wipe-test           - wipe (temporary) files generated by unit tests"
+       @echo " test-wipe           - wipe (temporary) files generated by unit tests"
        @echo ""
        @echo "Arguments controlling test runs:"
        @echo " V=[0|1|2]            - set test verbosity level"
@@ -76,5 +93,9 @@ help:
        @echo ""
        @echo "Creating test documentation"
        @echo " test-doc            - generate documentation for test framework"
-       @echo " wipe-test-doc       - wipe documentation for test framework"
+       @echo " test-wipe-doc       - wipe documentation for test framework"
+       @echo ""
+       @echo "Creating test code coverage report"
+       @echo " test-cov            - generate code coverage report for test framework"
+       @echo " test-wipe-cov       - wipe code coverage report for test framework"
        @echo ""