Enabling gcov production when debug is active

etr · etr · commit d0d785781295 · 2014-10-27T23:44:00.000Z
diff --git a/.travis.yml b/.travis.yml
@@ -17,7 +17,7 @@ script:
  - ./bootstrap
  - mkdir build
  - cd build
- - ../configure --enable-gcov
+ - ../configure --enable-debug
  - make
  - make check
    # - rm -rf build
diff --git a/Makefile.am b/Makefile.am
@@ -28,7 +28,7 @@ SUBDIRS = src test examples
 DIST_SUBDIRS = src test examples
 EXTRA_DIST = libhttpserver.pc.in debian/changelog.in debian/control.in debian/copyright.in debian/rules.in debian/libhttpserver-dev.install.in debian/libhttpserver.install.in redhat/libhttpserver.SPEC.in $(DX_CONFIG)
 
-MOSTLYCLEANFILES = $(DX_CLEANFILES) redhat/SOURCES/*
+MOSTLYCLEANFILES = $(DX_CLEANFILES) redhat/SOURCES/* *.gcda *.gcno *.gcov
 DISTCLEANFILES = redhat/SOURCES/* redhat/SPEC/* redhat/RPMS/* redhat/SRPMS/* redhat/* debian/* DIST_REVISION
 
 pkgconfigdir = $(libdir)/pkgconfig
diff --git a/bootstrap b/bootstrap
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 #     This file is part of libhttpserver
 #     Copyright (C) 2011, 2012, 2013, 2014 Sebastiano Merlino
diff --git a/configure.ac b/configure.ac
@@ -122,9 +122,11 @@ AC_ARG_ENABLE([debug],
     [debugit=no])
 AC_MSG_RESULT([$debugit])
 
+AM_CONDITIONAL([COND_GCOV],[test x"$debugit" = x"yes"])
+
 if test x"$debugit" = x"yes"; then
     AC_DEFINE([DEBUG],[],[Debug Mode])
-    AM_CXXFLAGS="$AM_CXXFLAGS -DDEBUG -g -Wall -Wno-uninitialized -O0 -fprofile-arcs -ftest-coverage"
+    AM_CXXFLAGS="$AM_CXXFLAGS -DDEBUG -g -Wall -Wno-uninitialized -O0 -fprofile-arcs -ftest-coverage --coverage --no-inline"
     LDFLAGS="-lgcov $LDFLAGS"
 else
     AC_DEFINE([NDEBUG],[],[No-debug Mode])
diff --git a/test/Makefile.am b/test/Makefile.am
@@ -21,10 +21,23 @@ AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/httpserver/
 METASOURCES = AUTO
 check_PROGRAMS = basic http_utils
 
+MOSTLYCLEANFILES = *.gcda *.gcno *.gcov
+
 basic_SOURCES = integ/basic.cpp 
 http_utils_SOURCES = unit/http_utils_test.cpp
 
 noinst_HEADERS = littletest.hpp
 AM_CXXFLAGS += -lcurl -Wall -fPIC
 
+if COND_GCOV
+
+TESTS = rmgcda $(check_PROGRAMS) gcov
+#basic.log: rmgcda.log
+#http_utils.log: rmgcda.log
+#gcov.log: basic.log http_utils.log
+
+else
+
 TESTS = $(check_PROGRAMS)
+
+endif
diff --git a/test/gcov b/test/gcov
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+for srcfile in ../src/*.cpp
+do
+  ( gcov -r $srcfile || gcov $srcfile ) > /dev/null 2> /dev/null
+done
+exit 0
diff --git a/test/rmgcda b/test/rmgcda
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+rm -f *.gcov *.gcda
+exit 0

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#!/bin/sh`
	`1`	`+#!/bin/bash`
`2`	`2`	`#`
`3`	`3`	`# This file is part of libhttpserver`
`4`	`4`	`# Copyright (C) 2011, 2012, 2013, 2014 Sebastiano Merlino`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +#!/bin/sh
++
 +rm -f *.gcov *.gcda
 +exit 0