From c63b6ab032b10f385f9e5ae558ec8b0bf57c9f14 Mon Sep 17 00:00:00 2001 From: Georg Hopp Date: Thu, 29 Mar 2012 11:40:45 +0200 Subject: [PATCH] change on coverage generation...i still don't get any branch info, and i am not sure what it would describe --- Makefile.am.coverage | 9 +++++---- tests/Makefile.am | 16 ++++++++-------- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/Makefile.am.coverage b/Makefile.am.coverage index 470d456..c45711a 100644 --- a/Makefile.am.coverage +++ b/Makefile.am.coverage @@ -16,13 +16,14 @@ $(MAKE) $(AM_MAKEFLAGS) generate-coverage-html init-coverage-html: - $(LCOV) -d $(top_builddir) -c -i -o coverage.base --no-checksum --compat-libtool + $(LCOV) -d $(top_builddir) -z + $(LCOV) -d $(top_builddir) -c -i -o coverage.base generate-coverage-html: @echo Collecting coverage data - $(LCOV) -d $(top_builddir) -c -o coverage.run --no-checksum --compat-libtool - $(LCOV) -d $(top_builddir) -a ./coverage.base -a ./coverage.run -o coverage.info --no-checksum --compat-libtool - LANG=C $(GENHTML) --prefix $(top_builddir) --output-directory coveragereport --title "Code Coverage" --legend --branch-coverage --show-details coverage.info + $(LCOV) -d $(top_builddir) -c -o coverage.run --gcov-tool /usr/x86_64-pc-linux-gnu/gcc-bin/4.5.3/gcov + $(LCOV) -d $(top_builddir) -a ./coverage.base -a ./coverage.run -o coverage.info + LANG=C $(GENHTML) --prefix $(top_builddir) --output-directory coveragereport --title "Code Coverage" --legend --branch-coverage --show-details coverage.run clean-coverage-html: clean-gcda -$(LCOV) --directory $(top_builddir) -z diff --git a/tests/Makefile.am b/tests/Makefile.am index 18fb04c..7f4a3e3 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -42,20 +42,20 @@ SERVER = $(SOCKET) \ mock/mock_worker.c classTest_SOURCES = $(CLASS) classTest.c -classTest_CFLAGS = -Wall -ggdb -O0 -fprofile-arcs -ftest-coverage -I ../include -I .. -I . -classTest_LDFLAGS = -lgcov +classTest_CFLAGS = -Wall -ggdb -O0 -fprofile-arcs -ftest-coverage -pg -I ../include -I .. -I . +classTest_LDFLAGS = -lgcov -pg loggerTest_SOURCES = $(LOGGER) loggerTest.c -loggerTest_CFLAGS = -Wall -ggdb -O0 -fprofile-arcs -ftest-coverage -I ../include -I .. -I . -loggerTest_LDFLAGS = -lgcov +loggerTest_CFLAGS = -Wall -ggdb -O0 -fprofile-arcs -ftest-coverage -pg -I ../include -I .. -I . +loggerTest_LDFLAGS = -lgcov -pg socketTest_SOURCES = $(SOCKET) socketTest.c -socketTest_CFLAGS = -Wall -ggdb -O0 -fprofile-arcs -ftest-coverage -I ../include -I .. -I . -socketTest_LDFLAGS = -lgcov +socketTest_CFLAGS = -Wall -ggdb -O0 -fprofile-arcs -ftest-coverage -pg -I ../include -I .. -I . +socketTest_LDFLAGS = -lgcov -pg serverTest_SOURCES = $(SERVER) serverTest.c -serverTest_CFLAGS = -Wall -ggdb -O0 -fprofile-arcs -ftest-coverage -I ../include -I .. -I . -serverTest_LDFLAGS = $(STREAM_OBJ) -lgcov +serverTest_CFLAGS = -Wall -ggdb -O0 -fprofile-arcs -ftest-coverage -pg -I ../include -I .. -I . +serverTest_LDFLAGS = $(STREAM_OBJ) -lgcov -pg EXTRA_DIST = runtest.h mock/mock_class.h mock/mock_logger.h