calculating coverage from test

Sebastiano Merlino · Sebastiano Merlino · commit 64ac7f2e3ae7 · 2015-01-18T05:15:05.000Z
diff --git a/.travis.yml b/.travis.yml
@@ -27,7 +27,6 @@ script:
  - make
  - make check
 after_success:
-  - cp src/.libs/*.gcda ./src/
   - cp -R ../src/* ./src/
   - cp -R ../src/details/* ./src/details/
   - cp -R ../src/httpserver/* ./src/httpserver/
diff --git a/ci-report-coverage b/ci-report-coverage
@@ -4,4 +4,4 @@ export EXCLUDE_COVERAGE="--exclude .libs"
 
 find ../ -name *.gcda
 echo "Sending coveralls json report"
-coveralls $EXCLUDE_COVERAGE --gcov-options '\-lp' -b ./src
+coveralls $EXCLUDE_COVERAGE --gcov-options '\-lp'
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -25,12 +25,6 @@ nobase_include_HEADERS = httpserver.hpp httpserver/create_webserver.hpp httpserv
 
 AM_CXXFLAGS += -fPIC -Wall
 
-if COND_GCOV
-AM_CFLAGS += -O0 --coverage
-AM_CXXFLAGS += -O0 --coverage
-AM_LDFLAGS += -O0 --coverage -lgcov
-endif
-
 libhttpserver_la_LIBADD = -lmicrohttpd
 libhttpserver_la_CFLAGS = $(AM_CFLAGS)
 libhttpserver_la_CXXFLAGS = $(AM_CXXFLAGS)
diff --git a/test/Makefile.am b/test/Makefile.am
@@ -29,4 +29,10 @@ http_utils_SOURCES = unit/http_utils_test.cpp
 noinst_HEADERS = littletest.hpp
 AM_CXXFLAGS += -lcurl -Wall -fPIC
 
+if COND_GCOV
+AM_CFLAGS += -O0 --coverage
+AM_CXXFLAGS += -O0 --coverage
+AM_LDFLAGS += -O0 --coverage -lgcov
+endif
+
 TESTS = $(check_PROGRAMS)
