From 0a82f6ec0542a495e44c0ebc932eab71b2661aae Mon Sep 17 00:00:00 2001 From: "Steinar H. Gunderson" Date: Wed, 12 Mar 2014 01:24:03 +0100 Subject: [PATCH] Make the COVERAGE variable into an --enable-coverage configure flag. This makes a lot more sense, since it controls compilation options. --- Makefile.in | 10 ++++++++-- configure.ac | 4 ++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/Makefile.in b/Makefile.in index f88fd5a..fadd3a3 100644 --- a/Makefile.in +++ b/Makefile.in @@ -8,6 +8,7 @@ datarootdir = @datarootdir@ datadir = @datadir@ top_builddir = @top_builddir@ with_demo_app = @with_demo_app@ +with_coverage = @with_coverage@ CC=@CC@ CXX=@CXX@ @@ -20,7 +21,7 @@ RANLIB=ranlib INSTALL=install MKDIR=mkdir -ifeq ($(COVERAGE),1) +ifeq ($(with_coverage),yes) CXXFLAGS += -fprofile-arcs -ftest-coverage --coverage LDFLAGS += -fprofile-arcs -ftest-coverage LDLIBS += -lgcov @@ -127,11 +128,16 @@ check: $(TESTS) exit 1; \ fi -# You need to build with COVERAGE=1 to use this target. +ifeq ($(with_coverage),yes) coverage: check lcov -d . -c -o movit.info lcov --remove movit.info '*_test.cpp' 'test_util.*' 'sandbox_effect.*' widgets.cpp -o movit.info genhtml -o coverage movit.info +else +coverage: + @echo You need to compile with --enable-coverage to use this target. + @exit 1 +endif HDRS = effect_chain.h effect_util.h effect.h input.h image_format.h init.h util.h defs.h resource_pool.h HDRS += $(INPUTS:=.h) diff --git a/configure.ac b/configure.ac index 7515e6d..5e03234 100644 --- a/configure.ac +++ b/configure.ac @@ -19,5 +19,9 @@ PKG_CHECK_MODULES([libpng], [libpng12], [], [with_demo_app=no; AC_MSG_WARN([libp AC_SUBST([with_demo_app]) +with_coverage=no +AC_ARG_ENABLE([coverage], [ --enable-coverage build with information needed to compute test coverage], [with_coverage=yes]) +AC_SUBST([with_coverage]) + AC_CONFIG_FILES([Makefile movit.pc]) AC_OUTPUT -- 2.39.2