summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Schmidt <stefan@osg.samsung.com>2016-03-02 13:14:00 +0100
committerStefan Schmidt <stefan@osg.samsung.com>2016-03-02 13:16:20 +0100
commit7c79165b53a2b1dd01eabdbbd865425531619a0b (patch)
tree3be2bfd4265d397478601b8f69616e05d941fcb7
parent09d0b53b94539a22254d9dbfb8a58d5e5787c397 (diff)
downloadefl-7c79165b53a2b1dd01eabdbbd865425531619a0b.tar.gz
build: fix problems with coverage check build where some files are not found
Switch to use a lcov config file which geninfo_auto_base and remove hard coding the base dir to src/lib. geninfo_auto_base is designed for a use case like ours where we have several base dirs (lib, bin, tests, ...) and it detects them automatically. This fixes failures in a coverage run where the file is simply looked for in the wrong directory.
-rw-r--r--.lcov-config1
-rw-r--r--Makefile.am2
2 files changed, 2 insertions, 1 deletions
diff --git a/.lcov-config b/.lcov-config
new file mode 100644
index 0000000000..bb631ac58f
--- /dev/null
+++ b/.lcov-config
@@ -0,0 +1 @@
+geninfo_auto_base = 1
diff --git a/Makefile.am b/Makefile.am
index 34b9ace1c9..08d87016d0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -430,7 +430,7 @@ lcov-reset:
lcov-report:
$(MKDIR_P) $(top_builddir)/coverage
- lcov --capture --compat-libtool --no-external --output-file $(top_builddir)/coverage/coverage.info --directory $(top_builddir) --base-directory $(top_srcdir)/src/
+ lcov --capture --compat-libtool --no-external --config-file .lcov-config --output-file $(top_builddir)/coverage/coverage.info --directory $(top_builddir)
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