Переписал механизм генерирования отчёта по покрытию "тестов".

Makefile.am

@@ -20,3 +20,7 @@ install-data-local:
 	$(MAKE) -C $(FIRSTSUBDIRS) -j1 install
 
 
+if HAVE_COVERAGE
+COVERAGE_DIRS=$(COVERAGE_DEFAULT_DIRS)
+include $(top_builddir)/testsuite/testcoverage-common.mk
+endif

configure.ac

@@ -254,9 +254,8 @@ AM_CONDITIONAL(HAVE_COVERAGE, test ${buildgcov} = true)
 AM_CONDITIONAL(HAVE_TESTS, test ${buildtests} = true)
 
 # export
-LDFLAGS="${OMNI_LIBS} ${XML_LIBS} ${SIGC_LIBS}"
-CXXFLAGS="-pedantic -Wall -funsigned-char -std=c++11 -g -D_GNU_SOURCE ${OMNI_CFLAGS} ${XML_CFLAGS} ${SIGC_CFLAGS} -I\$(top_builddir)/include"
-
+LDFLAGS="${OMNI_LIBS} ${XML_LIBS} ${SIGC_LIBS} ${COV_LIBS}"
+CXXFLAGS="-pedantic -Wall -funsigned-char -std=c++11 -g -D_GNU_SOURCE ${OMNI_CFLAGS} ${XML_CFLAGS} ${SIGC_CFLAGS} ${COV_CFLAGS} -I\$(top_builddir)/include"
 
 AC_SUBST(LDFLAGS)
 AC_SUBST(CXXFLAGS)

extensions/LogicProcessor/tests/Makefile.am

@@ -5,8 +5,8 @@ check_PROGRAMS = tests
 
 tests_SOURCES   = tests.cc lproc.cc
 tests_LDADD     = $(top_builddir)/lib/libUniSet2.la $(top_builddir)/extensions/lib/libUniSet2Extensions.la \
-	$(top_builddir)/extensions/LogicProcessor/libUniSet2LProcessor.la $(COV_LIBS)
-tests_CPPFLAGS  = -I$(top_builddir)/include -I$(top_builddir)/extensions/include -I$(top_builddir)/extensions/LogicProcessor $(COV_CFLAGS)
+	$(top_builddir)/extensions/LogicProcessor/libUniSet2LProcessor.la
+tests_CPPFLAGS  = -I$(top_builddir)/include -I$(top_builddir)/extensions/include -I$(top_builddir)/extensions/LogicProcessor
 
 $(top_builddir)/extensions/lib/libUniSet2Extensions.la:
 	cd $(top_builddir)/extensions/lib/ && make
@@ -23,10 +23,5 @@ check-local: atconfig package.m4 $(TESTSUITE)
 clean-local:
 	rm -rf $(CLEANFILES)
 	rm -rf $(COVERAGE_REPORT_DIR)
-	rm -f *.gcno *.gcda
-
-if HAVE_COVERAGE
-include $(top_builddir)/testsuite/testsuite-coverage-common.mk
-endif
 
 endif

extensions/ModbusMaster/tests/Makefile.am

@@ -6,19 +6,19 @@ run_test_mbtcpmaster_SOURCES   = run_test_mbtcpmaster.cc test_mbtcpmaster.cc MBT
 run_test_mbtcpmaster_LDADD     = $(top_builddir)/lib/libUniSet2.la $(top_builddir)/extensions/lib/libUniSet2Extensions.la \
 	$(top_builddir)/extensions/ModbusMaster/libUniSet2MBTCPMaster.la \
 	$(top_builddir)/extensions/SharedMemory/libUniSet2SharedMemory.la \
-	$(SIGC_LIBS) $(COMCPP_LIBS) $(COV_LIBS)
+	$(SIGC_LIBS) $(COMCPP_LIBS)
 run_test_mbtcpmaster_CPPFLAGS  = -I$(top_builddir)/include -I$(top_builddir)/extensions/include \
 	-I$(top_builddir)/extensions/ModbusMaster \
-	-I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS)  $(COMCPP_CFLAGS) $(COV_CFLAGS)
+	-I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS) $(COMCPP_CFLAGS)
 
 run_test_mbtcpmultimaster_SOURCES   = run_test_mbtcpmultimaster.cc test_mbtcpmultimaster.cc MBTCPTestServer.cc
 run_test_mbtcpmultimaster_LDADD     = $(top_builddir)/lib/libUniSet2.la $(top_builddir)/extensions/lib/libUniSet2Extensions.la \
 	$(top_builddir)/extensions/ModbusMaster/libUniSet2MBTCPMaster.la \
 	$(top_builddir)/extensions/SharedMemory/libUniSet2SharedMemory.la \
-	$(SIGC_LIBS) $(COMCPP_LIBS) $(COV_LIBS)
+	$(SIGC_LIBS) $(COMCPP_LIBS)
 run_test_mbtcpmultimaster_CPPFLAGS  = -I$(top_builddir)/include -I$(top_builddir)/extensions/include \
 	-I$(top_builddir)/extensions/ModbusMaster \
-	-I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS)  $(COMCPP_CFLAGS) $(COV_CFLAGS)
+	-I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS) $(COMCPP_CFLAGS)
 
 include $(top_builddir)/testsuite/testsuite-common.mk
 
@@ -28,10 +28,5 @@ check-local: atconfig package.m4 $(TESTSUITE) mbmaster-tests.at
 clean-local:
 	rm -rf $(CLEANFILES)
 	rm -rf $(COVERAGE_REPORT_DIR)
-	rm -f *.gcno *.gcda
-
-if HAVE_COVERAGE
-include $(top_builddir)/testsuite/testsuite-coverage-common.mk
-endif
 
 endif

extensions/ModbusSlave/tests/Makefile.am

@@ -6,10 +6,10 @@ tests_with_sm_SOURCES   = tests_with_sm.cc test_mbslave.cc
 tests_with_sm_LDADD     = $(top_builddir)/lib/libUniSet2.la $(top_builddir)/extensions/lib/libUniSet2Extensions.la \
 	$(top_builddir)/extensions/ModbusSlave/libUniSet2MBSlave.la \
 	$(top_builddir)/extensions/SharedMemory/libUniSet2SharedMemory.la \
-	$(SIGC_LIBS) $(COMCPP_LIBS) $(COV_LIBS)
+	$(SIGC_LIBS) $(COMCPP_LIBS)
 tests_with_sm_CPPFLAGS  = -I$(top_builddir)/include -I$(top_builddir)/extensions/include \
 	-I$(top_builddir)/extensions/ModbusSlave \
-	-I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS)  $(COMCPP_CFLAGS) $(COV_CFLAGS)
+	-I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS) $(COMCPP_CFLAGS)
 
 #$(top_builddir)/extensions/lib/libUniSet2Extensions.la:
 #	cd $(top_builddir)/extensions/lib/ && make
@@ -25,10 +25,5 @@ check-local: atconfig package.m4 $(TESTSUITE) mbslave-tests.at
 clean-local:
 	rm -rf $(CLEANFILES)
 	rm -rf $(COVERAGE_REPORT_DIR) 
-	rm -f *.gcno *.gcda
-
-if HAVE_COVERAGE
-include $(top_builddir)/testsuite/testsuite-coverage-common.mk
-endif
 
 endif

extensions/UNetUDP/tests/Makefile.am

@@ -6,10 +6,10 @@ tests_with_sm_SOURCES   = tests_with_sm.cc test_unetudp.cc
 tests_with_sm_LDADD     = $(top_builddir)/lib/libUniSet2.la $(top_builddir)/extensions/lib/libUniSet2Extensions.la \
 	$(top_builddir)/extensions/UNetUDP/libUniSet2UNetUDP.la \
 	$(top_builddir)/extensions/SharedMemory/libUniSet2SharedMemory.la \
-	$(SIGC_LIBS) $(COMCPP_LIBS) $(COV_LIBS)
+	$(SIGC_LIBS) $(COMCPP_LIBS)
 tests_with_sm_CPPFLAGS  = -I$(top_builddir)/include -I$(top_builddir)/extensions/include \
 	-I$(top_builddir)/extensions/UNetUDP \
-	-I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS)  $(COMCPP_CFLAGS) $(COV_CFLAGS)
+	-I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS)  $(COMCPP_CFLAGS)
 
 include $(top_builddir)/testsuite/testsuite-common.mk
 
@@ -19,11 +19,5 @@ check-local: atconfig package.m4 $(TESTSUITE) unetudp-tests.at
 clean-local:
 	rm -rf $(CLEANFILES)
 	rm -rf $(COVERAGE_REPORT_DIR)
-	rm -f *.gcno *.gcda
-
-if HAVE_COVERAGE
-# COVERAGE_EXCLUDE_FILES='include/*'
-include $(top_builddir)/testsuite/testsuite-coverage-common.mk
-endif
 
 endif

extensions/tests/Makefile.am

@@ -4,18 +4,18 @@ if  HAVE_TESTS
 noinst_PROGRAMS = tests tests_with_conf tests_with_sm
 
 tests_SOURCES   = tests.cc test_digitalfilter.cc test_vtypes.cc
-tests_LDADD     = $(top_builddir)/lib/libUniSet2.la $(top_builddir)/extensions/lib/libUniSet2Extensions.la $(COV_LIBS)
-tests_CPPFLAGS  = -I$(top_builddir)/include -I$(top_builddir)/extensions/include $(COV_CFLAGS)
+tests_LDADD     = $(top_builddir)/lib/libUniSet2.la $(top_builddir)/extensions/lib/libUniSet2Extensions.la
+tests_CPPFLAGS  = -I$(top_builddir)/include -I$(top_builddir)/extensions/include
 
 tests_with_conf_SOURCES   = tests_with_conf.cc test_calibration.cc test_iobase.cc
-tests_with_conf_LDADD     = $(top_builddir)/lib/libUniSet2.la $(top_builddir)/extensions/lib/libUniSet2Extensions.la $(COV_LIBS)
-tests_with_conf_CPPFLAGS  = -I$(top_builddir)/include -I$(top_builddir)/extensions/include $(COV_CFLAGS)
+tests_with_conf_LDADD     = $(top_builddir)/lib/libUniSet2.la $(top_builddir)/extensions/lib/libUniSet2Extensions.la
+tests_with_conf_CPPFLAGS  = -I$(top_builddir)/include -I$(top_builddir)/extensions/include
 
 tests_with_sm_SOURCES   = tests_with_sm.cc test_ui.cc test_iobase_with_sm.cc
 tests_with_sm_LDADD     = $(top_builddir)/lib/libUniSet2.la $(top_builddir)/extensions/lib/libUniSet2Extensions.la \
-	$(top_builddir)/extensions/SharedMemory/libUniSet2SharedMemory.la $(SIGC_LIBS) $(COMCPP_LIBS) $(COV_LIBS)
+	$(top_builddir)/extensions/SharedMemory/libUniSet2SharedMemory.la $(SIGC_LIBS) $(COMCPP_LIBS)
 tests_with_sm_CPPFLAGS  = -I$(top_builddir)/include -I$(top_builddir)/extensions/include \
-	-I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS) $(COMCPP_CFLAGS) $(COV_CFLAGS)
+	-I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS) $(COMCPP_CFLAGS)
 
 
 include $(top_builddir)/testsuite/testsuite-common.mk
@@ -26,11 +26,10 @@ check-local: atconfig package.m4 $(TESTSUITE)
 clean-local:
 	test ! -f '$(TESTSUITE)'|| $(SHELL) '$(TESTSUITE)' --clean
 	rm -rf $(CLEANFILES)
-	rm -rf $(COVERAGE_REPORT_DIR) .coverage*
-	rm -f *.gcno *.gcda
 
 if HAVE_COVERAGE
-include $(top_builddir)/testsuite/testsuite-coverage-common.mk
+COVERAGE_DIRS=$(abs_srcdir) $(top_builddir)/src/Interfaces $(top_builddir)/extensions/lib $(top_builddir)/extensions/SharedMemory
+include $(top_builddir)/testsuite/testcoverage-common.mk
 endif
 
 endif

python/lib/pyUniSet/Makefile.am

@@ -2,6 +2,19 @@ if DISABLE_PYTHON
 else
 python_SCRIPTS = pyUniSet.py pyUConnector.py pyUModbus.py pyUExceptions.py
 
+
+pyUniSet.py: UInterface_wrap.cxx _pyUniSet.la 
+	
+
+pyUConnector.py: UConnector_wrap.cxx _pyUConnector.la 
+	
+
+pyUModbus.py: _pyUModbus.la UModbus_wrap.cxx
+	
+
+pyUExceptions.py: _pyUExceptions.la
+	
+
 pyexec_LTLIBRARIES = _pyUConnector.la _pyUModbus.la _pyUExceptions.la _pyUniSet.la
 
 _pyUniSet_la_SOURCES 	= PyUInterface.cc UInterface_wrap.cxx

tests/Makefile.am

@@ -7,8 +7,8 @@ if HAVE_TESTS
 noinst_PROGRAMS = tests tests_with_conf
 
 #umutex threadtst dlog
-tests_LDADD 	= $(top_builddir)/lib/libUniSet2.la $(SIGC_LIBS) $(COMCPP_LIBS) $(COV_LIBS)
-tests_CPPFLAGS	= -I$(top_builddir)/include $(SIGC_CFLAGS) $(COMCPP_CFLAGS) $(COV_CFLAGS)
+tests_LDADD 	= $(top_builddir)/lib/libUniSet2.la $(SIGC_LIBS) $(COMCPP_LIBS)
+tests_CPPFLAGS	= -I$(top_builddir)/include $(SIGC_CFLAGS) $(COMCPP_CFLAGS)
 tests_SOURCES = tests.cc \
 test_passivetimer.cc \
 test_passivecondtimer.cc \
@@ -27,8 +27,8 @@ test_utypes.cc \
 test_mutex.cc \
 test_logserver.cc
 
-tests_with_conf_LDADD   = $(top_builddir)/lib/libUniSet2.la $(COV_LIBS)
-tests_with_conf_CPPFLAGS = -I$(top_builddir)/include $(COV_CFLAGS)
+tests_with_conf_LDADD   = $(top_builddir)/lib/libUniSet2.la
+tests_with_conf_CPPFLAGS = -I$(top_builddir)/include
 tests_with_conf_SOURCES = tests_with_conf.cc \
 test_conftest.cc \
 test_ui.cc \
@@ -47,11 +47,10 @@ check-local: atconfig package.m4 $(TESTSUITE)
 clean-local:
 	test ! -f '$(TESTSUITE)'|| $(SHELL) '$(TESTSUITE)' --clean
 	rm -rf $(CLEANFILES)
-	rm -rf $(COVERAGE_REPORT_DIR) .coverage*
-	rm -f *.gcno *.gcda
 
 if HAVE_COVERAGE
-include $(top_builddir)/testsuite/testsuite-coverage-common.mk
+COVERAGE_DIRS=$(abs_srcdir) $(top_builddir)/src
+include $(top_builddir)/testsuite/testcoverage-common.mk
 endif
 
 endif

testsuite/Makefile.am

@@ -9,5 +9,4 @@ check-local: atconfig package.m4 $(TESTSUITE)
 clean-local:
 	test ! -f '$(TESTSUITE)'|| $(SHELL) '$(TESTSUITE)' --clean
 	rm -rf $(CLEANFILES)
-
 endif

testsuite/testcoverage-common.mk

+COVERAGE_REPORT_DIR=$(abs_srcdir)/coverage-report
+COVERAGE_DEFAULT_DIRS=$(abs_srcdir) $(top_builddir)/src $(top_builddir)/extensions $(top_builddir)/tests
+
+cov:
+	if test -z "${COVERAGE_DIRS}"; then echo "UNDEFINED COVERAGE_DIRS="; exit -1; fi
+	rm -rf $(abs_srcdir)/.coverage.*
+	$(LCOV) -d "${COVERAGE_DIRS}" --zerocounters
+	make clean
+	test -f /usr/bin/jmake && jmake || make
+	make -i check
+	if test -z "${COVERAGE_DIRS}"; then echo "UNDEFINED COVERAGE_DIRS="; exit -1; fi
+	rm -rf $(abs_srcdir)/.coverage.*
+	for d in $(COVERAGE_DIRS); do \
+		TNAME=`mktemp .coverage.info.XXXXXXX`; \
+		$(LCOV) --capture --directory $$d --output-file $(abs_srcdir)/$$TNAME; \
+		if ! test -s $$TNAME; then rm -f $$TNAME; fi; \
+	done
+	COV_FILES=`ls .coverage.info.*`; COV_CMD=""; \
+	for d in $$COV_FILES; do \
+		COV_CMD="$$COV_CMD -a $$d"; \
+	done; \
+	$(LCOV) -d $(abs_srcdir) $$COV_CMD -o $(abs_srcdir)/.coverage.all
+	$(LCOV) -r $(abs_srcdir)/.coverage.all '/usr/include/catch.hpp' '/usr/include/*.h' '/usr/include/c++/*' \
+	'/usr/include/cc++/*' '/usr/include/omniORB4/*' '/usr/include/sigc++-2.0/sigc++/*' '*.hh' -o $(abs_srcdir)/.coverage.total
+	$(LCOV_GENHTML) $(abs_srcdir)/.coverage.total --output-directory $(COVERAGE_REPORT_DIR)
+	rm -rf $(abs_srcdir)/.coverage.*
+
+covrep:
+	if test -z "${COVERAGE_DIRS}"; then echo "UNDEFINED COVERAGE_DIRS="; exit -1; fi
+	rm -rf $(abs_srcdir)/.coverage.*
+	for d in $(COVERAGE_DIRS); do \
+		TNAME=`mktemp .coverage.info.XXXXXXX`; \
+		$(LCOV) --capture --directory $$d --output-file $(abs_srcdir)/$$TNAME; \
+		if ! test -s $$TNAME; then rm -f $$TNAME; fi; \
+	done
+	COV_FILES=`ls .coverage.info.*`; COV_CMD=""; \
+	for d in $$COV_FILES; do \
+		COV_CMD="$$COV_CMD -a $$d"; \
+	done; \
+	$(LCOV) -d $(abs_srcdir) $$COV_CMD -o $(abs_srcdir)/.coverage.all
+	$(LCOV) -r $(abs_srcdir)/.coverage.all '/usr/include/catch.hpp' '/usr/include/*.h' '/usr/include/c++/*' \
+	'/usr/include/cc++/*' '/usr/include/omniORB4/*' '/usr/include/sigc++-2.0/sigc++/*' '*.hh' -o $(abs_srcdir)/.coverage.total
+	$(LCOV_GENHTML) $(abs_srcdir)/.coverage.total --output-directory $(COVERAGE_REPORT_DIR)
+	rm -rf $(abs_srcdir)/.coverage.*

testsuite/testsuite-coverage-common.mk

-COVERAGE_REPORT_DIR=$(abs_srcdir)/coverage-report
-
-cov: all
-	make clean
-	make
-	$(LCOV) --directory $(abs_srcdir) --zerocounters
-	$(LCOV) -c -i -d $(abs_srcdir) -o $(abs_srcdir)/.coverage.base
-	make check
-	$(LCOV) -c -d $(abs_srcdir) -o $(abs_srcdir)/.coverage.run
-	$(LCOV) -d $(abs_srcdir) -a $(abs_srcdir)/.coverage.base -a $(abs_srcdir)/.coverage.run -o $(abs_srcdir)/.coverage.total
-	$(LCOV) -r $(abs_srcdir)/.coverage.total $(COVERAGE_EXCLUDE_FILES) '/usr/include/catch.hpp' '/usr/include/*.h' '/usr/include/c++/*' '/usr/include/cc++/*' '/usr/include/omniORB4/*' '/usr/include/sigc++-2.0/sigc++/*'\
-	'/usr/include/catch.hpp' -d $(abs_srcdir) -o $(abs_srcdir)/.coverage.total
-	$(LCOV_GENHTML) --no-branch-coverage -o $(COVERAGE_REPORT_DIR) $(abs_srcdir)/.coverage.total
-	rm -f $(abs_srcdir)/.coverage.base $(abs_srcdir)/.coverage.run $(abs_srcdir)/.coverage.total