aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSimon Warta <[email protected]>2015-06-22 09:20:36 +0200
committerSimon Warta <[email protected]>2015-06-22 09:20:36 +0200
commitd1bf8d1193820cecf96df2acef7fa2dea9758d6a (patch)
treec263b79abc36628311184680ab629b9c184d546d /src
parent37eaa6c05919acedf536e0c10573e4f29b4f4dbb (diff)
parentdb0e18e4dd040c7ecb9cb3b93c937c244c042b12 (diff)
Merge pull request #124 from webmaster128/fix-coverage
Fix coverage make target
Diffstat (limited to 'src')
-rw-r--r--src/build-data/makefile/gmake.in5
-rw-r--r--src/build-data/makefile/gmake_coverage.in9
2 files changed, 9 insertions, 5 deletions
diff --git a/src/build-data/makefile/gmake.in b/src/build-data/makefile/gmake.in
index ac3b8fae1..dd2fa418d 100644
--- a/src/build-data/makefile/gmake.in
+++ b/src/build-data/makefile/gmake.in
@@ -44,6 +44,9 @@ $(STATIC_LIB): $(LIBOBJS)
$(AR) $(STATIC_LIB) $(LIBOBJS)
$(RANLIB) $(STATIC_LIB)
+# Fake targets
+.PHONY = clean distclean docs website install valgrind lcov
+
%{gmake_coverage_in}
SPHINX_CONFIG = %{sphinx_config_dir}
@@ -52,8 +55,6 @@ SPHINX_OPTS = -b html
WEBSITE_DIR=%{doc_output_dir}/website
WEBSITE_SRC_DIR=%{doc_output_dir}/website-src
-.PHONY = clean distclean docs website install valgrind
-
clean:
-$(RM) %{libobj_dir}/*
-$(RM) %{testobj_dir}/*
diff --git a/src/build-data/makefile/gmake_coverage.in b/src/build-data/makefile/gmake_coverage.in
index 1ce9927a4..2656069e3 100644
--- a/src/build-data/makefile/gmake_coverage.in
+++ b/src/build-data/makefile/gmake_coverage.in
@@ -1,3 +1,6 @@
-lcov:
- lcov --directory build/obj/lib/ --directory src/lib --no-external --capture --output-file botan.info
- genhtml botan.info -o coverage/
+%{out_dir}/coverage/index.html: $(TEST)
+ LD_LIBRARY_PATH=%{out_dir} $(TEST)
+ lcov --directory "%{build_dir}/obj/lib" --base-directory "%{src_dir}" --no-external --capture --output-file "%{out_dir}/coverage.info"
+ genhtml "%{out_dir}/coverage.info" -o "%{out_dir}/coverage"
+
+lcov: %{out_dir}/coverage/index.html