From 2cebf6785eed26e3f4eda7b6d3d77954a19d3bfc Mon Sep 17 00:00:00 2001 From: Stefan Schmidt Date: Thu, 19 Jun 2014 15:36:01 +0200 Subject: [PATCH] Revert "Coverage: Fix base directory." This reverts commit 842e8e9fa01f2ce0c217dec2578d5ee3e0911a8b. Scratching my head over this for a long time now. It sneaked in when jenkins nightly builds which generates coverage reports was broken due to newer gettext error handling. After that was fixed the build kept being broken but now in coverage generation. Finnaly found this change. Why was it done? Did you actually test it? Coverage generation worked fine on my local system as well as on jenkins when I worked on this. If it is broken for you we might need to have another look, but not by breaking jenkins. --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index b8780204bb..010e9e69a1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -384,7 +384,7 @@ lcov-reset: lcov-report: @mkdir $(top_builddir)/coverage - lcov --capture --compat-libtool --no-external --output-file $(top_builddir)/coverage/coverage.info --directory $(top_builddir) --base-directory $(top_srcdir) + lcov --capture --compat-libtool --no-external --output-file $(top_builddir)/coverage/coverage.info --directory $(top_builddir) --base-directory $(top_srcdir)/src/ lcov --remove $(top_builddir)/coverage/coverage.info '*.h' --output-file $(top_builddir)/coverage/coverage.cleaned.info lcov --remove $(top_builddir)/coverage/coverage.cleaned.info '*/tests/*' --output-file $(top_builddir)/coverage/coverage.cleaned2.info lcov --remove $(top_builddir)/coverage/coverage.cleaned2.info '*NONE*' --output-file $(top_builddir)/coverage/coverage.cleaned3.info