Skip to content

U
uniset2
Commit b82fdb23 authored by Pavel Vainerman's avatar Pavel Vainerman
Browse files
Options

(COVERAGE): Сделал чтобы при --enable-coverage флаги

COV_LIBS и COV_CFLAGS подставлялись не глобально, а только в непосредственно в тестах.
parent 07b13146
Show whitespace changes
Inline Side-by-side
Showing with 33 additions and 34 deletions
configure.ac
View file @ b82fdb23
...@@ -247,12 +247,15 @@ else ...@@ -247,12 +247,15 @@ else
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
fi fi
AC_SUBST(COV_LIBS)
AC_SUBST(COV_CFLAGS)
AM_CONDITIONAL(HAVE_COVERAGE, test ${buildgcov} = true) AM_CONDITIONAL(HAVE_COVERAGE, test ${buildgcov} = true)
AM_CONDITIONAL(HAVE_TESTS, test ${buildtests} = true) AM_CONDITIONAL(HAVE_TESTS, test ${buildtests} = true)
# export # export
LDFLAGS="${OMNI_LIBS} ${XML_LIBS} ${SIGC_LIBS} ${COV_LIBS}" 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} ${COV_CFLAGS} -I\$(top_builddir)/include" CXXFLAGS="-pedantic -Wall -funsigned-char -std=c++11 -g -D_GNU_SOURCE ${OMNI_CFLAGS} ${XML_CFLAGS} ${SIGC_CFLAGS} -I\$(top_builddir)/include"
AC_SUBST(LDFLAGS) AC_SUBST(LDFLAGS)
......
extensions/LogicProcessor/tests/Makefile.am
View file @ b82fdb23
...@@ -5,8 +5,8 @@ check_PROGRAMS = tests ...@@ -5,8 +5,8 @@ check_PROGRAMS = tests
tests_SOURCES = tests.cc lproc.cc tests_SOURCES = tests.cc lproc.cc
tests_LDADD = $(top_builddir)/lib/libUniSet2.la $(top_builddir)/extensions/lib/libUniSet2Extensions.la \ tests_LDADD = $(top_builddir)/lib/libUniSet2.la $(top_builddir)/extensions/lib/libUniSet2Extensions.la \
$(top_builddir)/extensions/LogicProcessor/libUniSet2LProcessor.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 tests_CPPFLAGS = -I$(top_builddir)/include -I$(top_builddir)/extensions/include -I$(top_builddir)/extensions/LogicProcessor $(COV_CFLAGS)
$(top_builddir)/extensions/lib/libUniSet2Extensions.la: $(top_builddir)/extensions/lib/libUniSet2Extensions.la:
cd $(top_builddir)/extensions/lib/ && make cd $(top_builddir)/extensions/lib/ && make
...@@ -23,6 +23,7 @@ check-local: atconfig package.m4 $(TESTSUITE) ...@@ -23,6 +23,7 @@ check-local: atconfig package.m4 $(TESTSUITE)
clean-local: clean-local:
rm -rf $(CLEANFILES) rm -rf $(CLEANFILES)
rm -rf $(COVERAGE_REPORT_DIR) rm -rf $(COVERAGE_REPORT_DIR)
rm -f *.gcno *.gcda
if HAVE_COVERAGE if HAVE_COVERAGE
include $(top_builddir)/testsuite/testsuite-coverage-common.mk include $(top_builddir)/testsuite/testsuite-coverage-common.mk
......
extensions/ModbusMaster/tests/Makefile.am
View file @ b82fdb23
...@@ -6,20 +6,19 @@ run_test_mbtcpmaster_SOURCES = run_test_mbtcpmaster.cc test_mbtcpmaster.cc MBT ...@@ -6,20 +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 \ run_test_mbtcpmaster_LDADD = $(top_builddir)/lib/libUniSet2.la $(top_builddir)/extensions/lib/libUniSet2Extensions.la \
$(top_builddir)/extensions/ModbusMaster/libUniSet2MBTCPMaster.la \ $(top_builddir)/extensions/ModbusMaster/libUniSet2MBTCPMaster.la \
$(top_builddir)/extensions/SharedMemory/libUniSet2SharedMemory.la \ $(top_builddir)/extensions/SharedMemory/libUniSet2SharedMemory.la \
$(SIGC_LIBS) $(COMCPP_LIBS) $(SIGC_LIBS) $(COMCPP_LIBS) $(COV_LIBS)
run_test_mbtcpmaster_CPPFLAGS = -I$(top_builddir)/include -I$(top_builddir)/extensions/include \ run_test_mbtcpmaster_CPPFLAGS = -I$(top_builddir)/include -I$(top_builddir)/extensions/include \
-I$(top_builddir)/extensions/ModbusMaster \ -I$(top_builddir)/extensions/ModbusMaster \
-I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS) $(COMCPP_CFLAGS) -I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS) $(COMCPP_CFLAGS) $(COV_CFLAGS)
run_test_mbtcpmultimaster_SOURCES = run_test_mbtcpmultimaster.cc test_mbtcpmultimaster.cc MBTCPTestServer.cc 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 \ run_test_mbtcpmultimaster_LDADD = $(top_builddir)/lib/libUniSet2.la $(top_builddir)/extensions/lib/libUniSet2Extensions.la \
$(top_builddir)/extensions/ModbusMaster/libUniSet2MBTCPMaster.la \ $(top_builddir)/extensions/ModbusMaster/libUniSet2MBTCPMaster.la \
$(top_builddir)/extensions/SharedMemory/libUniSet2SharedMemory.la \ $(top_builddir)/extensions/SharedMemory/libUniSet2SharedMemory.la \
$(SIGC_LIBS) $(COMCPP_LIBS) $(SIGC_LIBS) $(COMCPP_LIBS) $(COV_LIBS)
run_test_mbtcpmultimaster_CPPFLAGS = -I$(top_builddir)/include -I$(top_builddir)/extensions/include \ run_test_mbtcpmultimaster_CPPFLAGS = -I$(top_builddir)/include -I$(top_builddir)/extensions/include \
-I$(top_builddir)/extensions/ModbusMaster \ -I$(top_builddir)/extensions/ModbusMaster \
-I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS) $(COMCPP_CFLAGS) -I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS) $(COMCPP_CFLAGS) $(COV_CFLAGS)
include $(top_builddir)/testsuite/testsuite-common.mk include $(top_builddir)/testsuite/testsuite-common.mk
...@@ -29,6 +28,7 @@ check-local: atconfig package.m4 $(TESTSUITE) mbmaster-tests.at ...@@ -29,6 +28,7 @@ check-local: atconfig package.m4 $(TESTSUITE) mbmaster-tests.at
clean-local: clean-local:
rm -rf $(CLEANFILES) rm -rf $(CLEANFILES)
rm -rf $(COVERAGE_REPORT_DIR) rm -rf $(COVERAGE_REPORT_DIR)
rm -f *.gcno *.gcda
if HAVE_COVERAGE if HAVE_COVERAGE
include $(top_builddir)/testsuite/testsuite-coverage-common.mk include $(top_builddir)/testsuite/testsuite-coverage-common.mk
......
extensions/ModbusSlave/tests/Makefile.am
View file @ b82fdb23
...@@ -6,10 +6,10 @@ tests_with_sm_SOURCES = tests_with_sm.cc test_mbslave.cc ...@@ -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 \ tests_with_sm_LDADD = $(top_builddir)/lib/libUniSet2.la $(top_builddir)/extensions/lib/libUniSet2Extensions.la \
$(top_builddir)/extensions/ModbusSlave/libUniSet2MBSlave.la \ $(top_builddir)/extensions/ModbusSlave/libUniSet2MBSlave.la \
$(top_builddir)/extensions/SharedMemory/libUniSet2SharedMemory.la \ $(top_builddir)/extensions/SharedMemory/libUniSet2SharedMemory.la \
$(SIGC_LIBS) $(COMCPP_LIBS) $(SIGC_LIBS) $(COMCPP_LIBS) $(COV_LIBS)
tests_with_sm_CPPFLAGS = -I$(top_builddir)/include -I$(top_builddir)/extensions/include \ tests_with_sm_CPPFLAGS = -I$(top_builddir)/include -I$(top_builddir)/extensions/include \
-I$(top_builddir)/extensions/ModbusSlave \ -I$(top_builddir)/extensions/ModbusSlave \
-I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS) $(COMCPP_CFLAGS) -I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS) $(COMCPP_CFLAGS) $(COV_CFLAGS)
#$(top_builddir)/extensions/lib/libUniSet2Extensions.la: #$(top_builddir)/extensions/lib/libUniSet2Extensions.la:
# cd $(top_builddir)/extensions/lib/ && make # cd $(top_builddir)/extensions/lib/ && make
...@@ -25,6 +25,7 @@ check-local: atconfig package.m4 $(TESTSUITE) mbslave-tests.at ...@@ -25,6 +25,7 @@ check-local: atconfig package.m4 $(TESTSUITE) mbslave-tests.at
clean-local: clean-local:
rm -rf $(CLEANFILES) rm -rf $(CLEANFILES)
rm -rf $(COVERAGE_REPORT_DIR) rm -rf $(COVERAGE_REPORT_DIR)
rm -f *.gcno *.gcda
if HAVE_COVERAGE if HAVE_COVERAGE
include $(top_builddir)/testsuite/testsuite-coverage-common.mk include $(top_builddir)/testsuite/testsuite-coverage-common.mk
......
extensions/UNetUDP/tests/Makefile.am
View file @ b82fdb23
...@@ -6,10 +6,10 @@ tests_with_sm_SOURCES = tests_with_sm.cc test_unetudp.cc ...@@ -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 \ tests_with_sm_LDADD = $(top_builddir)/lib/libUniSet2.la $(top_builddir)/extensions/lib/libUniSet2Extensions.la \
$(top_builddir)/extensions/UNetUDP/libUniSet2UNetUDP.la \ $(top_builddir)/extensions/UNetUDP/libUniSet2UNetUDP.la \
$(top_builddir)/extensions/SharedMemory/libUniSet2SharedMemory.la \ $(top_builddir)/extensions/SharedMemory/libUniSet2SharedMemory.la \
$(SIGC_LIBS) $(COMCPP_LIBS) $(SIGC_LIBS) $(COMCPP_LIBS) $(COV_LIBS)
tests_with_sm_CPPFLAGS = -I$(top_builddir)/include -I$(top_builddir)/extensions/include \ tests_with_sm_CPPFLAGS = -I$(top_builddir)/include -I$(top_builddir)/extensions/include \
-I$(top_builddir)/extensions/UNetUDP \ -I$(top_builddir)/extensions/UNetUDP \
-I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS) $(COMCPP_CFLAGS) -I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS) $(COMCPP_CFLAGS) $(COV_CFLAGS)
include $(top_builddir)/testsuite/testsuite-common.mk include $(top_builddir)/testsuite/testsuite-common.mk
...@@ -19,6 +19,7 @@ check-local: atconfig package.m4 $(TESTSUITE) unetudp-tests.at ...@@ -19,6 +19,7 @@ check-local: atconfig package.m4 $(TESTSUITE) unetudp-tests.at
clean-local: clean-local:
rm -rf $(CLEANFILES) rm -rf $(CLEANFILES)
rm -rf $(COVERAGE_REPORT_DIR) rm -rf $(COVERAGE_REPORT_DIR)
rm -f *.gcno *.gcda
if HAVE_COVERAGE if HAVE_COVERAGE
# COVERAGE_EXCLUDE_FILES='include/*' # COVERAGE_EXCLUDE_FILES='include/*'
......
extensions/tests/Makefile.am
View file @ b82fdb23
...@@ -4,18 +4,18 @@ if HAVE_TESTS ...@@ -4,18 +4,18 @@ if HAVE_TESTS
noinst_PROGRAMS = tests tests_with_conf tests_with_sm noinst_PROGRAMS = tests tests_with_conf tests_with_sm
tests_SOURCES = tests.cc test_digitalfilter.cc test_vtypes.cc tests_SOURCES = tests.cc test_digitalfilter.cc test_vtypes.cc
tests_LDADD = $(top_builddir)/lib/libUniSet2.la $(top_builddir)/extensions/lib/libUniSet2Extensions.la 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 tests_CPPFLAGS = -I$(top_builddir)/include -I$(top_builddir)/extensions/include $(COV_CFLAGS)
tests_with_conf_SOURCES = tests_with_conf.cc test_calibration.cc test_iobase.cc 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 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 tests_with_conf_CPPFLAGS = -I$(top_builddir)/include -I$(top_builddir)/extensions/include $(COV_CFLAGS)
tests_with_sm_SOURCES = tests_with_sm.cc test_ui.cc test_iobase_with_sm.cc 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 \ 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) $(top_builddir)/extensions/SharedMemory/libUniSet2SharedMemory.la $(SIGC_LIBS) $(COMCPP_LIBS) $(COV_LIBS)
tests_with_sm_CPPFLAGS = -I$(top_builddir)/include -I$(top_builddir)/extensions/include \ tests_with_sm_CPPFLAGS = -I$(top_builddir)/include -I$(top_builddir)/extensions/include \
-I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS) $(COMCPP_CFLAGS) -I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS) $(COMCPP_CFLAGS) $(COV_CFLAGS)
include $(top_builddir)/testsuite/testsuite-common.mk include $(top_builddir)/testsuite/testsuite-common.mk
...@@ -26,7 +26,8 @@ check-local: atconfig package.m4 $(TESTSUITE) ...@@ -26,7 +26,8 @@ check-local: atconfig package.m4 $(TESTSUITE)
clean-local: clean-local:
test ! -f '$(TESTSUITE)'|| $(SHELL) '$(TESTSUITE)' --clean test ! -f '$(TESTSUITE)'|| $(SHELL) '$(TESTSUITE)' --clean
rm -rf $(CLEANFILES) rm -rf $(CLEANFILES)
rm -rf $(COVERAGE_REPORT_DIR) .coverage* *.gcno rm -rf $(COVERAGE_REPORT_DIR) .coverage*
rm -f *.gcno *.gcda
if HAVE_COVERAGE if HAVE_COVERAGE
include $(top_builddir)/testsuite/testsuite-coverage-common.mk include $(top_builddir)/testsuite/testsuite-coverage-common.mk
......
tests/Makefile.am
View file @ b82fdb23
...@@ -7,8 +7,8 @@ if HAVE_TESTS ...@@ -7,8 +7,8 @@ if HAVE_TESTS
noinst_PROGRAMS = tests tests_with_conf noinst_PROGRAMS = tests tests_with_conf
#umutex threadtst dlog #umutex threadtst dlog
tests_LDADD = $(top_builddir)/lib/libUniSet2.la $(SIGC_LIBS) $(COMCPP_LIBS) tests_LDADD = $(top_builddir)/lib/libUniSet2.la $(SIGC_LIBS) $(COMCPP_LIBS) $(COV_LIBS)
tests_CPPFLAGS = -I$(top_builddir)/include $(SIGC_CFLAGS) $(COMCPP_CFLAGS) tests_CPPFLAGS = -I$(top_builddir)/include $(SIGC_CFLAGS) $(COMCPP_CFLAGS) $(COV_CFLAGS)
tests_SOURCES = tests.cc \ tests_SOURCES = tests.cc \
test_passivetimer.cc \ test_passivetimer.cc \
test_hourglass.cc \ test_hourglass.cc \
...@@ -25,27 +25,18 @@ test_modbustypes.cc \ ...@@ -25,27 +25,18 @@ test_modbustypes.cc \
test_utypes.cc \ test_utypes.cc \
test_mutex.cc test_mutex.cc
tests_with_conf_LDADD = $(top_builddir)/lib/libUniSet2.la tests_with_conf_LDADD = $(top_builddir)/lib/libUniSet2.la $(COV_LIBS)
tests_with_conf_CPPFLAGS = -I$(top_builddir)/include tests_with_conf_CPPFLAGS = -I$(top_builddir)/include $(COV_CFLAGS)
tests_with_conf_SOURCES = tests_with_conf.cc \ tests_with_conf_SOURCES = tests_with_conf.cc \
test_conftest.cc \ test_conftest.cc \
test_ui.cc \ test_ui.cc \
test_iorfile.cc \ test_iorfile.cc \
test_messagetype.cc test_messagetype.cc
# umutex_SOURCES = umutex.cc
# umutex_LDADD = $(top_builddir)/lib/libUniSet2.la $(COMCPP_LIBS)
# umutex_CPPFLAGS = -I$(top_builddir)/include $(COMCPP_CFLAGS)
#
# threadtst_SOURCES = threadtst.cc # threadtst_SOURCES = threadtst.cc
# threadtst_LDADD = $(top_builddir)/lib/libUniSet2.la ${SIGC_LIBS} $(COMCPP_LIBS) # threadtst_LDADD = $(top_builddir)/lib/libUniSet2.la ${SIGC_LIBS} $(COMCPP_LIBS)
# threadtst_CPPFLAGS = -I$(top_builddir)/include ${SIGC_CFLAGS} $(COMCPP_CFLAGS) # threadtst_CPPFLAGS = -I$(top_builddir)/include ${SIGC_CFLAGS} $(COMCPP_CFLAGS)
# #
# dlog_SOURCES = dlog.cc
# dlog_LDADD = $(top_builddir)/lib/libUniSet2.la ${SIGC_LIBS} $(COMCPP_LIBS)
# dlog_CPPFLAGS = -I$(top_builddir)/include ${SIGC_CFLAGS} $(COMCPP_CFLAGS)
#
include $(top_builddir)/testsuite/testsuite-common.mk include $(top_builddir)/testsuite/testsuite-common.mk
check-local: atconfig package.m4 $(TESTSUITE) check-local: atconfig package.m4 $(TESTSUITE)
...@@ -54,7 +45,8 @@ check-local: atconfig package.m4 $(TESTSUITE) ...@@ -54,7 +45,8 @@ check-local: atconfig package.m4 $(TESTSUITE)
clean-local: clean-local:
test ! -f '$(TESTSUITE)'|| $(SHELL) '$(TESTSUITE)' --clean test ! -f '$(TESTSUITE)'|| $(SHELL) '$(TESTSUITE)' --clean
rm -rf $(CLEANFILES) rm -rf $(CLEANFILES)
rm -rf $(COVERAGE_REPORT_DIR) .coverage* *.gcno rm -rf $(COVERAGE_REPORT_DIR) .coverage*
rm -f *.gcno *.gcda
if HAVE_COVERAGE if HAVE_COVERAGE
include $(top_builddir)/testsuite/testsuite-coverage-common.mk include $(top_builddir)/testsuite/testsuite-coverage-common.mk
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment