From 098a7be9414efa12435d72e56e0bac4652b00996 Mon Sep 17 00:00:00 2001 From: Stefan Schmidt Date: Wed, 2 Mar 2016 09:07:41 +0100 Subject: [PATCH] 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 like this: genhtml: ERROR: cannot read /srv/build/workspace/manual_elm_gcc_x86_64_exactness_coverage/src/lib/test_win_state.c Where the file is simply looked for in the wrong directory. --- legacy/elementary/.lcov-config | 1 + legacy/elementary/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 legacy/elementary/.lcov-config diff --git a/legacy/elementary/.lcov-config b/legacy/elementary/.lcov-config new file mode 100644 index 0000000000..bb631ac58f --- /dev/null +++ b/legacy/elementary/.lcov-config @@ -0,0 +1 @@ +geninfo_auto_base = 1 diff --git a/legacy/elementary/Makefile.am b/legacy/elementary/Makefile.am index 3ab56f4d1f..3340622999 100644 --- a/legacy/elementary/Makefile.am +++ b/legacy/elementary/Makefile.am @@ -134,7 +134,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)/src/lib/ + 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 '*/elm_test_*' --output-file $(top_builddir)/coverage/coverage.cleaned2.info lcov --remove $(top_builddir)/coverage/coverage.cleaned2.info '*/elm_suite.c' --output-file $(top_builddir)/coverage/coverage.cleaned3.info