From 6ec2725aeb7351007473e1c9d4425c0ec0c3df85 Mon Sep 17 00:00:00 2001 From: Dominik Holland Date: Mon, 23 Apr 2018 10:54:01 +0200 Subject: Fix problems when building for test coverage The coverage target needs to be available in all Makefiles not just in debug configurations Use qtLibraryTarget for all plugins in the servicemanager autotest. This will automatically add the needed postfixes for debug and release plugins Change-Id: I887e27ce1cc514d74cbaef97b02eeb935939a7cf Reviewed-by: Robert Griebl --- mkspecs/features/ivi-coverage.prf | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) (limited to 'mkspecs') diff --git a/mkspecs/features/ivi-coverage.prf b/mkspecs/features/ivi-coverage.prf index b642b4a..27448b4 100644 --- a/mkspecs/features/ivi-coverage.prf +++ b/mkspecs/features/ivi-coverage.prf @@ -1,18 +1,16 @@ # generate code coverage information using gcov/lcov/genhtml -CONFIG(debug,debug|release) { - equals(TEMPLATE, "subdirs") { - sub-coverage.target = coverage - sub-coverage.CONFIG = recursive - QMAKE_EXTRA_TARGETS += sub-coverage - } else { - coverage_pre.commands += @echo && echo "Building with coverage support..." && echo $(eval CXXFLAGS += -O0 -fprofile-arcs -ftest-coverage)$(eval LFLAGS += -O0 -fprofile-arcs -ftest-coverage) +equals(TEMPLATE, "subdirs") { + sub-coverage.target = coverage + sub-coverage.CONFIG = recursive + QMAKE_EXTRA_TARGETS += sub-coverage +} else { + coverage_pre.commands += @echo && echo "Building with coverage support..." && echo $(eval CXXFLAGS += -O0 -fprofile-arcs -ftest-coverage)$(eval LFLAGS += -O0 -fprofile-arcs -ftest-coverage) - coverage.CONFIG += recursive - coverage.commands = @echo && echo "Finished building with coverage support." && echo - build_pass|!debug_and_release:coverage.depends = coverage_pre all + coverage.CONFIG += recursive + coverage.commands = @echo && echo "Finished building with coverage support." && echo + build_pass|!debug_and_release:coverage.depends = coverage_pre all - QMAKE_EXTRA_TARGETS *= coverage_pre coverage - } + QMAKE_EXTRA_TARGETS *= coverage_pre coverage } QMAKE_CLEAN += $(OBJECTS_DIR)/*.gcda $(OBJECTS_DIR)/*.gcno $(TARGET).gcov-info -- cgit v1.2.1