Implement Python coverage measure.

Jürgen Knödlseder
1 parent fd57d4d4
Showing 5 changed files with 72 additions and 4 deletions
.gitignore
Makefile.am
configure.ac
test/Makefile.am
test/test_python.sh.in
@@ -36,6 +36,8 @@ m4/lt~obsolete.m4
 *.dvi
 *.idx
 *.out
+*.gcda
+*.gcno
 .DS_Store
 .libs
 .deps
@@ -83,6 +85,7 @@ test/*.xml
 test/reports/*.xml
 test/*.trs
 test/region.reg
+test/test_python.sh
 examples/python/*.xml
 examples/python/*.html
@@ -76,7 +76,8 @@ dynamic-analysis: coverage valgrind
 # Add cppcheck rule
 cppcheck:
 	@if type cppcheck >/dev/null 2>&1; then \
-		cppcheck -v --enable=all --xml --suppress=missingIncludeSystem \
+		cppcheck -v --enable=all --xml --xml-version=2 \
+        --suppress=missingIncludeSystem \
 		-Iinclude -Iinst/lat/include -Iinst/cta/include -Iinst/mwl/include \
 		inst/*/src inst/*/test src test 2> cppcheck-result.xml; \
 	else \
@@ -104,9 +105,15 @@ cppncss:
 # Add coverage rule
 coverage:
 	@if type gcovr >/dev/null 2>&1; then \
-		gcovr -r . -x -o gcovr-reports-data.xml; \
+		gcovr -r . -x -o coverage-report-cxx.xml; \
 	else \
 		echo "gcovr script not found in PATH."; \
+	fi; \
+	if type coverage >/dev/null 2>&1; then \
+	    export COVERAGE_FILE=test/.coverage; \
+		coverage xml -o coverage-report-python.xml; \
+	else \
+		echo "coverage script not found in PATH."; \
 	fi
 # Add Valgrind rule
@@ -1016,6 +1016,32 @@ fi
 #############################################################################
+# Checks for coverage option                                                #
+#############################################################################
+# Initialise Python coverage with empty string
+PYTHON_COVERAGE=
+
+# Check for coverage option
+AC_MSG_CHECKING(whether to build GammaLib for code coverage measure)
+AC_ARG_ENABLE([coverage],
+              AS_HELP_STRING([--enable-coverage],
+                             [turn on code coverage measure [default=no]]),
+              [enable_coverage="$enableval"],
+              [enable_coverage="no"])
+if test "x$enable_coverage" = "xyes"; then
+  CXXFLAGS="--coverage $CXXFLAGS"
+  LDFLAGS="--coverage $LDFLAGS"
+  if test "x$has_python" = "xyes"; then
+    PYTHON_COVERAGE="coverage run --append "
+  fi
+  AC_MSG_RESULT(yes)
+else
+  AC_MSG_RESULT(no)
+fi
+AC_SUBST(PYTHON_COVERAGE)
+
+
+#############################################################################
 # Initialise directory path for test environment                            #
 #############################################################################
 TEST_ENV_DIR=
@@ -1365,11 +1391,13 @@ AC_CONFIG_FILES([Makefile
                  src/gammalib-setup
                  include/Makefile
                  test/Makefile
+                 test/test_python.sh
                  pyext/Makefile
                  pyext/setup.py
                  gammalib.pc
                  testconf.sh],
-                [if test -f testconf.sh; then chmod +x testconf.sh; fi])
+                [if test -f test/test_python.sh; then chmod +x test/test_python.sh; fi;
+                 if test -f testconf.sh; then chmod +x testconf.sh; fi])
 if test "x$with_inst" = "xyes"; then
   AC_CONFIG_FILES([inst/Makefile])
@@ -44,7 +44,7 @@ endif
 # Optional python bindings
 if WITH_PYTHON
-  TEST_PYTHON_SCRIPT = test_python.py
+  TEST_PYTHON_SCRIPT = test_python.sh
   TEST_PYTHON_ENV    = PYTHONPATH=$(top_builddir)/pyext:$(top_builddir)/pyext/build/gammalib$(TEST_MWL)$(TEST_CTA)$(TEST_LAT)$(TEST_COM):$(PYTHONPATH)
 endif
+#! /bin/sh
+# ==========================================================================
+# This script tests the GammaLib Python module
+#
+# Copyright (C) 2016 Juergen Knoedlseder
+#
+# 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 3 of the License, 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/>.
+#
+# ==========================================================================
+
+#
+# Remove any existing coverage file
+# =================================
+rm -rf .coverage
+
+#
+# Run the Python test
+# ===================
+@PYTHON_COVERAGE@./test_python.py