Including shared lib in gcov analysis

Sebastiano Merlino · Sebastiano Merlino · commit 9bae50c80ddb · 2015-01-18T13:28:07.000Z
diff --git a/.travis.yml b/.travis.yml
@@ -24,15 +24,8 @@ script:
  - mkdir build
  - cd build
  - if [ $DEBUG = "debug" ]; then ../configure --enable-debug; else ../configure; fi
- - make
- - make check
+ - if [ $DEBUG = "debug" ]; then make check; else make; make check; fi
 after_success:
-  - cp -R ../src/* ./src/
-  - cp -R ../src/details/* ./src/details/
-  - cp -R ../src/httpserver/* ./src/httpserver/
-  - cp -R ../test/* ./test/
-  - cp -R ../test/integ/* ./test/integ/
-  - cp -R ../test/unit/* ./test/unit/
   - if [ $DEBUG = "debug" ]; then ../ci-report-coverage; fi
 matrix:
   exclude:
diff --git a/ci-report-coverage b/ci-report-coverage
@@ -3,5 +3,15 @@
 export EXCLUDE_COVERAGE="--exclude .libs"
 
 find ../ -name *.gcda
+
+echo "Copying files to the correct locations for correct gcov analysis"
+cp -R ../src/* ./src/
+cp -R ../src/details/* ./src/details/
+cp -R ../src/httpserver/* ./src/httpserver/
+cp -R ./src/.libs/*.gcda ./src/
+cp -R ../test/* ./test/
+cp -R ../test/integ/* ./test/integ/
+cp -R ../test/unit/* ./test/unit/
+
 echo "Sending coveralls json report"
 coveralls $EXCLUDE_COVERAGE --gcov-options '\-lp'
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -25,6 +25,12 @@ 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)
