diff options
-rw-r--r-- | mkspecs/common.pri | 10 | ||||
-rw-r--r-- | tests/common_bot.pri | 4 | ||||
-rw-r--r-- | tests/coverage.pri | 10 | ||||
-rw-r--r-- | tests/ft_localedata/ft_localedata.pro | 6 |
4 files changed, 15 insertions, 15 deletions
diff --git a/mkspecs/common.pri b/mkspecs/common.pri index 4e5cc031..1f79dc3c 100644 --- a/mkspecs/common.pri +++ b/mkspecs/common.pri @@ -98,6 +98,16 @@ contains(USE_CCACHE, "true") { QMAKE_CXX = ccache g++ } +contains( M_BUILD_FEATURES, coverage ) { + QMAKE_CXXFLAGS += -ftest-coverage -fprofile-arcs + LIBS += -lgcov + + QMAKE_CLEAN += \ + *.gcda \ + *.gcno +} + + QMAKE_LIBDIR += $${M_BUILD_TREE}/lib include(shared.pri) diff --git a/tests/common_bot.pri b/tests/common_bot.pri index de409f44..b09d96f3 100644 --- a/tests/common_bot.pri +++ b/tests/common_bot.pri @@ -2,7 +2,3 @@ DEPENDS= contains( M_BUILD_FEATURES, coverage ) { include(coverage.pri) } - -QMAKE_CLEAN += \ - *.gcda \ - *.gcno \ diff --git a/tests/coverage.pri b/tests/coverage.pri index f5526181..05e2ae6e 100644 --- a/tests/coverage.pri +++ b/tests/coverage.pri @@ -6,9 +6,6 @@ defineReplace(srcList) { return($${ITEMLIST}) } -QMAKE_CXXFLAGS += -ftest-coverage -fprofile-arcs -LIBS += -lgcov - # OBJECTS_DIR = .obj MOC_DIR = .moc @@ -22,5 +19,8 @@ coverage-xml.depends = check-xml coverage-xml.commands = @../coverage.py $$srcList($$TEST_SOURCES) .obj 90 -QMAKE_CLEAN += *.gcda *.gcno *.gcov *.log *.xml -QMAKE_DISTCLEAN += *.gcda *.gcno *.gcov *.log *.xml +QMAKE_CLEAN += *.gcda *.gcno *.gcov *.log +#there are some xml files used in testing +#*.xml +QMAKE_DISTCLEAN += *.gcda *.gcno *.gcov *.log +#*.xml diff --git a/tests/ft_localedata/ft_localedata.pro b/tests/ft_localedata/ft_localedata.pro index 45df96ca..29cb120a 100644 --- a/tests/ft_localedata/ft_localedata.pro +++ b/tests/ft_localedata/ft_localedata.pro @@ -1,12 +1,6 @@ include(../common_top.pri) TARGET = ft_localedata -LIBS += -lgcov -QMAKE_CXXFLAGS += -ftest-coverage -fprofile-arcs - -# For gcov testing, disabled currently. Add -lgcov to LIBS if -# this is enabled -# QMAKE_CXXFLAGS += -ftest-coverage -fprofile-arcs # unit TEST_SOURCES = \ |