Build: Fix coverage builds

Author: beekhof

configure.ac

@@ -295,14 +295,13 @@ AC_ARG_WITH(initdir,
 SUPPORT_PROFILING=0
 AC_ARG_WITH(profiling,
     [  --with-profiling
-       Support gprof profiling ],
+       Disable optimizations for effective profiling ],
     [ SUPPORT_PROFILING=$withval ])
 
-SUPPORT_GCOV=0
-AC_ARG_WITH(gcov,
-    [  --with-gcov
-       Support gcov coverage testing ],
-    [ SUPPORT_GCOV=$withval ])
+AC_ARG_WITH(coverage,
+    [  --with-coverage
+       Disable optimizations for effective profiling ],
+    [ SUPPORT_COVERAGE=$withval ])
 
 PUBLICAN_BRAND="common"
 AC_ARG_WITH(brand,
@@ -957,36 +956,38 @@ dnl ========================================================================
 dnl    Profiling and GProf
 dnl ========================================================================
 
-case $SUPPORT_GCOV in
+AC_MSG_NOTICE(Old CFLAGS: $CFLAGS)
+case $SUPPORT_COVERAGE in
      1|yes|true)
 	SUPPORT_PROFILING=1
+	PCMK_FEATURES="$PCMK_FEATURES coverage"
+	CFLAGS="$CFLAGS -fprofile-arcs -ftest-coverage"
+	dnl During linking, make sure to specify -lgcov or -coverage
+
+        dnl Enable gprof
+	#LIBS="$LIBS -pg"
+	#CFLAGS="$CFLAGS -pg"
 	;;
 esac
 
 case $SUPPORT_PROFILING in
      1|yes|true)
 	SUPPORT_PROFILING=1
 
-        dnl Enable gprof
-	#LIBS="$LIBS -pg"
-	#CFLAGS="$CFLAGS -pg"
-
 	dnl Disable various compiler optimizations
-	CFLAGS="$CFLAGS -fno-omit-frame-pointer -fprofile-arcs -ftest-coverage -fno-inline"
-	#CFLAGS="$CFLAGS -fno-inline-functions -fno-inline-functions-called-once -fno-optimize-sibling-calls"
-	dnl CFLAGS="$CFLAGS -fno-default-inline -fno-inline"
+	CFLAGS="$CFLAGS -fno-omit-frame-pointer -fno-inline"
+	dnl CFLAGS="$CFLAGS -fno-inline-functions -fno-default-inline -fno-inline-functions-called-once -fno-optimize-sibling-calls"
 
-	dnl Turn off optimization so code coverage tool can get accurate line numbers
-	AC_MSG_NOTICE(Old CFLAGS: $CFLAGS)
+	dnl Turn off optimization so tools can get accurate line numbers
 	CFLAGS=`echo $CFLAGS | sed -e 's/-O.\ //g' -e 's/-Wp,-D_FORTIFY_SOURCE=.\ //g' -e 's/-D_FORTIFY_SOURCE=.\ //g'`
 	CFLAGS="$CFLAGS -O0"
-	AC_MSG_NOTICE(New CFLAGS: $CFLAGS)
 
 	dnl Update features
 	PCMK_FEATURES="$PCMK_FEATURES profile"
 	;;
      *) SUPPORT_PROFILING=0;;
 esac
+AC_MSG_NOTICE(New CFLAGS: $CFLAGS)
 AC_DEFINE_UNQUOTED(SUPPORT_PROFILING, $SUPPORT_PROFILING, Support for profiling)
 
 dnl ========================================================================

coverage.sh.in

@@ -1,5 +1,6 @@
 #!/bin/bash
 
+start=$PWD
 test_home=`dirname $0`
 sanitydir=@datadir@/@PACKAGE@/tests
 
@@ -27,7 +28,15 @@ else
     export GCOV_PREFIX_STRIP=4
     export GCOV_PREFIX=$GCOV_BASE
 
-    cd `rpm -ql pacemaker-debuginfo | grep include | head -n 1`/..
+    top=`find / -name crm_internal.h 2>/dev/null | grep debug | head -n 1`
+    if [ "x$top" = x ]; then
+	echo "Could not locate the pacemaker headers"
+	exit 1
+    fi
+
+    cd `dirname $top`
+    cd ..
+
     echo "Creating the directory structure in $GCOV_BASE from $PWD"
     # The .gcno files will already be there for sources,
     # but we still need to create the include/ subtree
@@ -39,7 +48,7 @@ else
     find . -type f -name "*.debug" -exec ln -s $PWD/\{\} $GCOV_BASE\{\} \;
 fi
 
-cd -
+cd $start
 lcov -d $GCOV_BASE -z
 
 # Run all active regression tests
@@ -50,3 +59,4 @@ lcov -d $GCOV_BASE -c -o pacemaker.info
 rm -rf html
 mkdir html
 genhtml -o html pacemaker.info
+ 

pacemaker.spec.in

@@ -24,6 +24,9 @@
 # Build with/without support for profiling tools
 %bcond_with profiling
 
+# Include Build with/without support for performing coverage analysis
+%bcond_with coverage
+
 # We generate docs using Publican, Asciidoc and Inkscape, but they're not available everywhere
 %bcond_without doc
 
@@ -92,19 +95,19 @@ BuildRequires: bison byacc flex help2man gnutls-devel
 BuildRequires: systemd-devel
 %endif
 
-%if "%{?_vendor}" == "redhat"
-
 # If you want to build for unofficial installs of corosync-2 on RHEL < 7
 # or fedora < 17, remove all references to clusterlib-devel below
 
+%if 0%{?fedora} > 0
 %if 0%{?fedora} < 17
 BuildRequires: clusterlib-devel
 %endif
+%endif
 
+%if 0%{?rhel} > 0
 %if 0%{?rhel} < 7
 BuildRequires: clusterlib-devel
 %endif
-
 %endif
 
 Requires:      corosync
@@ -137,7 +140,7 @@ when related resources fail and can be configured to periodically check
 resource health.
 
 Available rpmbuild rebuild options:
-  --with(out) : stonithd doc profiling pre_release upstart_job
+  --with(out) : stonithd doc coverage profiling pre_release upstart_job
 
 %package cli
 License:       GPLv2+ and LGPLv2+
@@ -254,6 +257,7 @@ find . -exec touch \{\} \;
 # RHEL <= 5 does not support --docdir
 docdir=%{pcmk_docdir} %{configure}                 \
         %{?with_profiling:   --with-profiling}     \
+        %{?with_coverage:    --with-coverage}      \
         --with-initdir=%{_initrddir}               \
         --localstatedir=%{_var}                    \
         --with-version=%{version}-%{release}
@@ -301,7 +305,7 @@ rm -f %{buildroot}/%{_initrddir}/pacemaker
 rm -f %{buildroot}/%{_initrddir}/pacemaker_remote
 %endif
 
-%if %{with profiling}
+%if %{with coverage}
 GCOV_BASE=%{buildroot}/%{_var}/lib/pacemaker/gcov
 mkdir -p $GCOV_BASE
 find . -name '*.gcno' -type f | while read F ; do
@@ -520,7 +524,7 @@ exit 0
 %{_datadir}/pacemaker/tests
 %{_includedir}/pacemaker
 %{_libdir}/*.so
-%if %{with profiling}
+%if %{with coverage}
 %{_var}/lib/pacemaker
 %endif
 %{_libdir}/pkgconfig/*.pc