configure: Add switch to build with --coverage

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/Jenkinsfile b/Jenkinsfile
index 483dc8fe7ed2e0f6cc804e7b9340ec8b14bb5fed..1ddd4e387666cdb8b7ca0b4a05f138313bef1d03 100644 (file)
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -80,9 +80,9 @@ pipeline {
                                                        steps {
                                                                sh "./autogen.sh"
                                                                sh """
-                                                                        CFLAGS="-O2 -g --coverage" \
                                                                        ./configure \
                                                                                --prefix=/usr \
+                                                                               --enable-coverage \
                                                                                --enable-debug
                                                                """
                                                        }
@@ -90,7 +90,7 @@ pipeline {
 
                                                stage("Build") {
                                                        steps {
-                                                               sh "make"
+                                                               sh "make V=1"
                                                        }
                                                }
 

diff --git a/Makefile.am b/Makefile.am
index f3dc12dd618ad7b6f8061702016c8a3c44e28930..1ca9630d70e497d674d2f971a1eaa29e0981ab28 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -169,6 +169,7 @@ libpakfire_parser_la_SOURCES = \
 
 libpakfire_parser_la_CFLAGS = \
        $(AM_CFLAGS) \
+       $(COVERAGE_CFLAGS) \
        $(JSON_C_CFLAGS)
 
 libpakfire_parser_la_CPPFLAGS = \
@@ -295,6 +296,7 @@ pkginclude_HEADERS += \
 
 libpakfire_la_CFLAGS = \
        $(AM_CFLAGS) \
+       $(COVERAGE_CFLAGS) \
        -fvisibility=hidden \
        $(BPF_CFLAGS) \
        $(CAP_CFLAGS) \
@@ -323,6 +325,7 @@ libpakfire_la_CPPFLAGS = \
 
 libpakfire_la_LDFLAGS = \
        $(AM_LDFLAGS) \
+       $(COVERAGE_LDFLAGS) \
        -version-info $(LIBPAKFIRE_CURRENT):$(LIBPAKFIRE_REVISION):$(LIBPAKFIRE_AGE) \
        -Wl,--version-script=$(top_srcdir)/src/libpakfire/libpakfire.sym
 
@@ -373,6 +376,7 @@ libpakfire_internal_la_CFLAGS = \
 
 libpakfire_internal_la_LDFLAGS = \
        $(AM_LDFLAGS) \
+       $(COVERAGE_LDFLAGS) \
        -Wl,--version-script=$(top_srcdir)/src/libpakfire/libpakfire.sym
 
 libpakfire_internal_la_LIBADD = \
@@ -394,10 +398,12 @@ pakfire_CPPFLAGS = \
        -I$(top_srcdir)/src/libpakfire/include
 
 pakfire_CFLAGS = \
-       $(AM_CFLAGS)
+       $(AM_CFLAGS) \
+       $(COVERAGE_CFLAGS)
 
 pakfire_LDFLAGS = \
-       $(AM_LDFLAGS)
+       $(AM_LDFLAGS) \
+       $(COVERAGE_LDFLAGS)
 
 pakfire_LDADD = \
        libpakfire.la \
@@ -416,10 +422,12 @@ pakfire_builder_CPPFLAGS = \
        -I$(top_srcdir)/src/libpakfire/include
 
 pakfire_builder_CFLAGS = \
-       $(AM_CFLAGS)
+       $(AM_CFLAGS) \
+       $(COVERAGE_CFLAGS)
 
 pakfire_builder_LDFLAGS = \
-       $(AM_LDFLAGS)
+       $(AM_LDFLAGS) \
+       $(COVERAGE_LDFLAGS)
 
 pakfire_builder_LDADD = \
        libpakfire.la \
@@ -438,10 +446,12 @@ pakfire_client_CPPFLAGS = \
        -I$(top_srcdir)/src/libpakfire/include
 
 pakfire_client_CFLAGS = \
-       $(AM_CFLAGS)
+       $(AM_CFLAGS) \
+       $(COVERAGE_CFLAGS)
 
 pakfire_client_LDFLAGS = \
-       $(AM_LDFLAGS)
+       $(AM_LDFLAGS) \
+       $(COVERAGE_LDFLAGS)
 
 pakfire_client_LDADD = \
        libpakfire.la \
@@ -462,10 +472,12 @@ pakfire_daemon_CPPFLAGS = \
        -I$(top_srcdir)/src/libpakfire/include
 
 pakfire_daemon_CFLAGS = \
-       $(AM_CFLAGS)
+       $(AM_CFLAGS) \
+       $(COVERAGE_CFLAGS)
 
 pakfire_daemon_LDFLAGS = \
-       $(AM_LDFLAGS)
+       $(AM_LDFLAGS) \
+       $(COVERAGE_LDFLAGS)
 
 pakfire_daemon_LDADD = \
        libpakfire.la \
@@ -567,10 +579,12 @@ libcli_la_CPPFLAGS = \
 
 libcli_la_CFLAGS = \
        $(AM_CFLAGS) \
+       $(COVERAGE_CFLAGS) \
        $(JSON_C_CFLAGS)
 
 libcli_la_LDFLAGS = \
        $(AM_LDFLAGS) \
+       $(COVERAGE_LDFLAGS) \
        $(JSON_C_LIBS)
 
 libcli_la_LIBADD = \
@@ -614,6 +628,9 @@ tests_libpakfire_main_CPPFLAGS = \
 tests_libpakfire_main_CFLAGS = \
        $(TESTSUITE_CFLAGS)
 
+tests_libpakfire_main_LDFLAGS = \
+       $(TESTSUITE_LDFLAGS)
+
 tests_libpakfire_main_LDADD = \
        $(TESTSUITE_LDADD)
 
@@ -626,6 +643,9 @@ tests_libpakfire_arch_CPPFLAGS = \
 tests_libpakfire_arch_CFLAGS = \
        $(TESTSUITE_CFLAGS)
 
+tests_libpakfire_arch_LDFLAGS = \
+       $(TESTSUITE_LDFLAGS)
+
 tests_libpakfire_arch_LDADD = \
        $(TESTSUITE_LDADD)
 
@@ -638,6 +658,9 @@ tests_libpakfire_archive_CPPFLAGS = \
 tests_libpakfire_archive_CFLAGS = \
        $(TESTSUITE_CFLAGS)
 
+tests_libpakfire_archive_LDFLAGS = \
+       $(TESTSUITE_LDFLAGS)
+
 tests_libpakfire_archive_LDADD = \
        $(TESTSUITE_LDADD)
 
@@ -650,6 +673,9 @@ tests_libpakfire_build_CPPFLAGS = \
 tests_libpakfire_build_CFLAGS = \
        $(TESTSUITE_CFLAGS)
 
+tests_libpakfire_build_LDFLAGS = \
+       $(TESTSUITE_LDFLAGS)
+
 tests_libpakfire_build_LDADD = \
        $(TESTSUITE_LDADD)
 
@@ -662,6 +688,9 @@ tests_libpakfire_cgroup_CPPFLAGS = \
 tests_libpakfire_cgroup_CFLAGS = \
        $(TESTSUITE_CFLAGS)
 
+tests_libpakfire_cgroup_LDFLAGS = \
+       $(TESTSUITE_LDFLAGS)
+
 tests_libpakfire_cgroup_LDADD = \
        $(TESTSUITE_LDADD)
 
@@ -674,6 +703,9 @@ tests_libpakfire_compress_CPPFLAGS = \
 tests_libpakfire_compress_CFLAGS = \
        $(TESTSUITE_CFLAGS)
 
+tests_libpakfire_compress_LDFLAGS = \
+       $(TESTSUITE_LDFLAGS)
+
 tests_libpakfire_compress_LDADD = \
        $(TESTSUITE_LDADD)
 
@@ -686,6 +718,9 @@ tests_libpakfire_config_CPPFLAGS = \
 tests_libpakfire_config_CFLAGS = \
        $(TESTSUITE_CFLAGS)
 
+tests_libpakfire_config_LDFLAGS = \
+       $(TESTSUITE_LDFLAGS)
+
 tests_libpakfire_config_LDADD = \
        $(TESTSUITE_LDADD)
 
@@ -698,6 +733,9 @@ tests_libpakfire_db_CPPFLAGS = \
 tests_libpakfire_db_CFLAGS = \
        $(TESTSUITE_CFLAGS)
 
+tests_libpakfire_db_LDFLAGS = \
+       $(TESTSUITE_LDFLAGS)
+
 tests_libpakfire_db_LDADD = \
        $(TESTSUITE_LDADD)
 
@@ -710,6 +748,9 @@ tests_libpakfire_deps_CPPFLAGS = \
 tests_libpakfire_deps_CFLAGS = \
        $(TESTSUITE_CFLAGS)
 
+tests_libpakfire_deps_LDFLAGS = \
+       $(TESTSUITE_LDFLAGS)
+
 tests_libpakfire_deps_LDADD = \
        $(TESTSUITE_LDADD)
 
@@ -722,6 +763,9 @@ tests_libpakfire_digest_CPPFLAGS = \
 tests_libpakfire_digest_CFLAGS = \
        $(TESTSUITE_CFLAGS)
 
+tests_libpakfire_digest_LDFLAGS = \
+       $(TESTSUITE_LDFLAGS)
+
 tests_libpakfire_digest_LDADD = \
        $(TESTSUITE_LDADD)
 
@@ -734,6 +778,9 @@ tests_libpakfire_file_CPPFLAGS = \
 tests_libpakfire_file_CFLAGS = \
        $(TESTSUITE_CFLAGS)
 
+tests_libpakfire_file_LDFLAGS = \
+       $(TESTSUITE_LDFLAGS)
+
 tests_libpakfire_file_LDADD = \
        $(TESTSUITE_LDADD)
 
@@ -746,6 +793,9 @@ tests_libpakfire_httpclient_CPPFLAGS = \
 tests_libpakfire_httpclient_CFLAGS = \
        $(TESTSUITE_CFLAGS)
 
+tests_libpakfire_httpclient_LDFLAGS = \
+       $(TESTSUITE_LDFLAGS)
+
 tests_libpakfire_httpclient_LDADD = \
        $(TESTSUITE_LDADD)
 
@@ -758,6 +808,9 @@ tests_libpakfire_jail_CPPFLAGS = \
 tests_libpakfire_jail_CFLAGS = \
        $(TESTSUITE_CFLAGS)
 
+tests_libpakfire_jail_LDFLAGS = \
+       $(TESTSUITE_CFLAGS)
+
 tests_libpakfire_jail_LDADD = \
        $(TESTSUITE_LDADD)
 
@@ -770,6 +823,9 @@ tests_libpakfire_key_CPPFLAGS = \
 tests_libpakfire_key_CFLAGS = \
        $(TESTSUITE_CFLAGS)
 
+tests_libpakfire_key_LDFLAGS = \
+       $(TESTSUITE_LDFLAGS)
+
 tests_libpakfire_key_LDADD = \
        $(TESTSUITE_LDADD)
 
@@ -782,6 +838,9 @@ tests_libpakfire_makefile_CPPFLAGS = \
 tests_libpakfire_makefile_CFLAGS = \
        $(TESTSUITE_CFLAGS)
 
+tests_libpakfire_makefile_LDFLAGS = \
+       $(TESTSUITE_LDFLAGS)
+
 tests_libpakfire_makefile_LDADD = \
        $(TESTSUITE_LDADD)
 
@@ -794,6 +853,9 @@ tests_libpakfire_os_CPPFLAGS = \
 tests_libpakfire_os_CFLAGS = \
        $(TESTSUITE_CFLAGS)
 
+tests_libpakfire_os_LDFLAGS = \
+       $(TESTSUITE_LDFLAGS)
+
 tests_libpakfire_os_LDADD = \
        $(TESTSUITE_LDADD)
 
@@ -806,6 +868,9 @@ tests_libpakfire_package_CPPFLAGS = \
 tests_libpakfire_package_CFLAGS = \
        $(TESTSUITE_CFLAGS)
 
+tests_libpakfire_package_LDFLAGS = \
+       $(TESTSUITE_LDFLAGS)
+
 tests_libpakfire_package_LDADD = \
        $(TESTSUITE_LDADD)
 
@@ -818,6 +883,9 @@ tests_libpakfire_packager_CPPFLAGS = \
 tests_libpakfire_packager_CFLAGS = \
        $(TESTSUITE_CFLAGS)
 
+tests_libpakfire_packager_LDFLAGS = \
+       $(TESTSUITE_LDFLAGS)
+
 tests_libpakfire_packager_LDADD = \
        $(TESTSUITE_LDADD)
 
@@ -830,6 +898,9 @@ tests_libpakfire_parser_CPPFLAGS = \
 tests_libpakfire_parser_CFLAGS = \
        $(TESTSUITE_CFLAGS)
 
+tests_libpakfire_parser_LDFLAGS = \
+       $(TESTSUITE_LDFLAGS)
+
 tests_libpakfire_parser_LDADD = \
        $(TESTSUITE_LDADD)
 
@@ -842,6 +913,9 @@ tests_libpakfire_path_CPPFLAGS = \
 tests_libpakfire_path_CFLAGS = \
        $(TESTSUITE_CFLAGS)
 
+tests_libpakfire_path_LDFLAGS = \
+       $(TESTSUITE_LDFLAGS)
+
 tests_libpakfire_path_LDADD = \
        $(TESTSUITE_LDADD)
 
@@ -854,6 +928,9 @@ tests_libpakfire_repo_CPPFLAGS = \
 tests_libpakfire_repo_CFLAGS = \
        $(TESTSUITE_CFLAGS)
 
+tests_libpakfire_repo_LDFLAGS = \
+       $(TESTSUITE_LDFLAGS)
+
 tests_libpakfire_repo_LDADD = \
        $(TESTSUITE_LDADD)
 
@@ -866,6 +943,9 @@ tests_libpakfire_string_CPPFLAGS = \
 tests_libpakfire_string_CFLAGS = \
        $(TESTSUITE_CFLAGS)
 
+tests_libpakfire_string_LDFLAGS = \
+       $(TESTSUITE_LDFLAGS)
+
 tests_libpakfire_string_LDADD = \
        $(TESTSUITE_LDADD)
 
@@ -878,6 +958,9 @@ tests_libpakfire_util_CPPFLAGS = \
 tests_libpakfire_util_CFLAGS = \
        $(TESTSUITE_CFLAGS)
 
+tests_libpakfire_util_LDFLAGS = \
+       $(TESTSUITE_LDFLAGS)
+
 tests_libpakfire_util_LDADD = \
        $(TESTSUITE_LDADD)
 
@@ -890,6 +973,9 @@ tests_libpakfire_xfer_CPPFLAGS = \
 tests_libpakfire_xfer_CFLAGS = \
        $(TESTSUITE_CFLAGS)
 
+tests_libpakfire_xfer_LDFLAGS = \
+       $(TESTSUITE_LDFLAGS)
+
 tests_libpakfire_xfer_LDADD = \
        $(TESTSUITE_LDADD)
 
@@ -923,10 +1009,10 @@ tests_parser_test_CPPFLAGS = \
        -DPAKFIRE_PRIVATE
 
 tests_parser_test_CFLAGS = \
-       $(JSON_C_CFLAGS)
+       $(TESTSUITE_CFLAGS)
 
 tests_parser_test_LDFLAGS = \
-       $(AM_LDFLAGS)
+       $(TESTSUITE_LDFLAGS)
 
 tests_parser_test_LDADD = \
        libpakfire.la \
@@ -1096,8 +1182,13 @@ TESTSUITE_CPPFLAGS = \
 
 TESTSUITE_CFLAGS = \
        $(AM_CFLAGS) \
+       $(COVERAGE_CFLAGS) \
        $(JSON_C_CFLAGS)
 
+TESTSUITE_LDFLAGS = \
+       $(AM_LDFLAGS) \
+       $(COVERAGE_LDFLAGS)
+
 TESTSUITE_LDADD = \
        tests/libtestsuite.la \
        libpakfire.la \

diff --git a/configure.ac b/configure.ac
index d172344d090409224117d3d155755e36168544c2..375f957103a38251026dbe7a171eb22b60f84a92 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -58,6 +58,11 @@ AC_PROG_LN_S
 AC_PROG_MKDIR_P
 AC_PROG_SED
 
+dnl Switch to enable build with --coverage
+AC_ARG_ENABLE([coverage],
+       AS_HELP_STRING([--enable-coverage], [build with --coverage @<:@default=disabled@:>@]),
+       [], [enable_coverage=no])
+
 AC_ARG_ENABLE([debug],
        AS_HELP_STRING([--enable-debug], [enable debug messages @<:@default=disabled@:>@]),
        [], [enable_debug=no])
@@ -152,6 +157,15 @@ AC_SUBST([OUR_CPPFLAGS], $with_cppflags)
 AC_SUBST([OUR_CFLAGS], $with_cflags)
 AC_SUBST([OUR_LDFLAGS], $with_ldflags)
 
+dnl Check for support for --coverage
+if test "x${enable_coverage}" = "xyes"; then
+       CC_CHECK_FLAGS_APPEND([coverage_cflags],  [CFLAGS],  [--coverage])
+       CC_CHECK_FLAGS_APPEND([coverage_ldflags], [LDFLAGS], [--coverage])
+fi
+
+AC_SUBST([COVERAGE_CFLAGS],  ${coverage_cflags})
+AC_SUBST([COVERAGE_LDFLAGS], ${coverage_ldflags})
+
 # C Types
 AC_TYPE_INT64_T
 AC_TYPE_INTMAX_T