settings: add support for code coverage to the settings plugins

Use:

  ./autogen.sh --enable-code-coverage
  make
  make -C src/settings check-code-coverage

diff --git a/Makefile.am b/Makefile.am
index d9a5896..9e58dcd 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,6 +18,8 @@ SUBDIRS = \
        examples \
        vapi
 
+@GNOME_CODE_COVERAGE_RULES@
+
 EXTRA_DIST = \
        CONTRIBUTING \
        NetworkManager.pc.in \

diff --git a/src/Makefile.am b/src/Makefile.am
index 9d306a7..0639e29 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -15,6 +15,8 @@ SUBDIRS= \
        wifi \
        settings
 
+@GNOME_CODE_COVERAGE_RULES@
+
 if WITH_WIMAX
 SUBDIRS += wimax
 endif

diff --git a/src/settings/Makefile.am b/src/settings/Makefile.am
index 6ca7633..9ec1d96 100644 (file)
--- a/src/settings/Makefile.am
+++ b/src/settings/Makefile.am
@@ -1,5 +1,7 @@
 SUBDIRS = plugins . tests
 
+@GNOME_CODE_COVERAGE_RULES@
+
 INCLUDES = -I${top_srcdir} \
            -I${top_builddir}/include \
            -I${top_srcdir}/include \

diff --git a/src/settings/plugins/Makefile.am b/src/settings/plugins/Makefile.am
index 8b39b3f..41694e7 100644 (file)
--- a/src/settings/plugins/Makefile.am
+++ b/src/settings/plugins/Makefile.am
@@ -1,5 +1,7 @@
 SUBDIRS=keyfile example
 
+@GNOME_CODE_COVERAGE_RULES@
+
 if CONFIG_PLUGIN_IFCFG_RH
 SUBDIRS+=ifcfg-rh
 endif

diff --git a/src/settings/plugins/ifcfg-rh/Makefile.am b/src/settings/plugins/ifcfg-rh/Makefile.am
index a2c3f0f..8b1d394 100644 (file)
--- a/src/settings/plugins/ifcfg-rh/Makefile.am
+++ b/src/settings/plugins/ifcfg-rh/Makefile.am
@@ -1,5 +1,7 @@
 SUBDIRS = . tests
 
+@GNOME_CODE_COVERAGE_RULES@
+
 nm-ifcfg-rh-glue.h: nm-ifcfg-rh.xml
        $(AM_V_GEN) dbus-binding-tool --prefix=nm_ifcfg_rh --mode=glib-server --output=$@ $<
 

diff --git a/src/settings/plugins/ifcfg-rh/tests/Makefile.am b/src/settings/plugins/ifcfg-rh/tests/Makefile.am
index 9aec92f..daf3fa2 100644 (file)
--- a/src/settings/plugins/ifcfg-rh/tests/Makefile.am
+++ b/src/settings/plugins/ifcfg-rh/tests/Makefile.am
@@ -2,41 +2,61 @@ if ENABLE_TESTS
 
 SUBDIRS=network-scripts
 
-INCLUDES = \
+@GNOME_CODE_COVERAGE_RULES@
+
+AM_CPPFLAGS = \
+       $(GLIB_CFLAGS) \
+       $(DBUS_CFLAGS) \
+       $(CODE_COVERAGE_CFLAGS) \
        -I$(top_srcdir)/include \
        -I$(top_builddir)/include \
        -I$(top_srcdir)/libnm-util \
        -I$(top_builddir)/libnm-util \
        -I$(top_srcdir)/libnm-glib \
+       -I$(top_srcdir)/src/settings \
+       -I$(top_srcdir)/src/wifi \
+       -I$(top_srcdir)/src/posix-signals \
        -I$(srcdir)/../
 
+AM_LDFLAGS = \
+       $(GLIB_LIBS) \
+       $(DBUS_LIBS) \
+       $(CODE_COVERAGE_LDFLAGS)
+
+AM_LDADD = \
+       $(top_builddir)/libnm-util/libnm-util.la \
+       $(top_builddir)/libnm-glib/libnm-glib.la
+
 noinst_PROGRAMS = test-ifcfg-rh test-ifcfg-rh-utils
 
 test_ifcfg_rh_SOURCES = \
-       test-ifcfg-rh.c
+       test-ifcfg-rh.c \
+       ../errors.c \
+       ../reader.c \
+       ../shvar.c \
+       ../utils.c \
+       ../writer.c
 
 test_ifcfg_rh_CPPFLAGS = \
-       $(GLIB_CFLAGS) \
-       $(DBUS_CFLAGS) \
+       $(AM_CPPFLAGS) \
        -DTEST_IFCFG_DIR=\"$(abs_srcdir)\" \
-       -DTEST_SCRATCH_DIR=\"$(abs_builddir)/\"
+       -DTEST_SCRATCH_DIR=\"$(abs_builddir)/\" \
+       -DSYSCONFDIR=\"nonexistent\" \
+       -DSBINDIR=\"nonexistent\"
 
 test_ifcfg_rh_LDADD = \
-       $(top_builddir)/libnm-glib/libnm-glib.la \
-       $(top_builddir)/libnm-util/libnm-util.la \
+       $(AM_LDADD) \
        $(top_builddir)/src/wifi/libwifi-utils.la \
-       $(builddir)/../libifcfg-rh-io.la \
+       $(top_builddir)/src/posix-signals/libnm-posix-signals.la \
        $(LIBM)
-       $(DBUS_LIBS)
 
 test_ifcfg_rh_utils_SOURCES = \
-       test-ifcfg-rh-utils.c
-
-test_ifcfg_rh_utils_CPPFLAGS = \
-       $(GLIB_CFLAGS)
+       test-ifcfg-rh-utils.c \
+       ../utils.c \
+       ../shvar.c
 
 test_ifcfg_rh_utils_LDADD = \
-       $(builddir)/../libifcfg-rh-io.la
+       $(AM_LDADD)
 
 check-local: test-ifcfg-rh
        $(abs_builddir)/test-ifcfg-rh-utils

diff --git a/src/settings/plugins/ifnet/Makefile.am b/src/settings/plugins/ifnet/Makefile.am
index 9aaa06f..788d018 100644 (file)
--- a/src/settings/plugins/ifnet/Makefile.am
+++ b/src/settings/plugins/ifnet/Makefile.am
@@ -1,5 +1,7 @@
 SUBDIRS = . tests
 
+@GNOME_CODE_COVERAGE_RULES@
+
 INCLUDES = \
        -I$(top_srcdir)/src/wifi \
        -I$(top_srcdir)/src/settings \

diff --git a/src/settings/plugins/ifnet/tests/Makefile.am b/src/settings/plugins/ifnet/tests/Makefile.am
index 23f96c8..19ee13c 100644 (file)
--- a/src/settings/plugins/ifnet/tests/Makefile.am
+++ b/src/settings/plugins/ifnet/tests/Makefile.am
@@ -1,26 +1,40 @@
 if ENABLE_TESTS
 
+@GNOME_CODE_COVERAGE_RULES@
+
 INCLUDES=-I$(srcdir)/../ \
         -I$(top_srcdir)/libnm-glib \
         -I$(top_srcdir)/libnm-util \
         -I$(top_builddir)/libnm-util \
         -I$(top_srcdir)/include \
         -I$(top_builddir)/include \
-        -I$(top_srcdir)/src/settings
+        -I$(top_srcdir)/src/settings \
+        -I$(top_srcdir)/src/wifi
 
 noinst_PROGRAMS = check_ifnet
-check_ifnet_SOURCES = test_all.c
+check_ifnet_SOURCES = \
+       test_all.c \
+       ../connection_parser.c \
+       ../net_parser.c \
+       ../net_utils.c \
+       ../wpa_parser.c
 
 check_ifnet_CPPFLAGS = \
        $(CHECK_CFLAGS) \
        $(GLIB_CFLAGS) \
-       -DTEST_WPA_SUPPLICANT_CONF='"$(srcdir)/wpa_supplicant.conf"'
+       $(CODE_COVERAGE_CFLAGS) \
+       -DTEST_WPA_SUPPLICANT_CONF='"$(srcdir)/wpa_supplicant.conf"' \
+       -DSYSCONFDIR=\"nonexistent\"
+
+check_ifnet_LDFLAGS = \
+       $(CODE_COVERAGE_LDFLAGS)
 
 check_ifnet_LDADD = $(top_builddir)/libnm-util/libnm-util.la \
-                   $(builddir)/../lib-ifnet-io.la \
-                   $(CHECK_LIBS) \
-                   $(GLIB_LIBS) \
-                   $(LIBM)
+       $(CHECK_LIBS) \
+       $(GLIB_LIBS) \
+       $(LIBM) \
+       $(top_builddir)/src/wifi/libwifi-utils.la
+
 check-local: check_ifnet
        $(abs_builddir)/check_ifnet $(abs_srcdir) $(abs_builddir)
 

diff --git a/src/settings/plugins/ifupdown/Makefile.am b/src/settings/plugins/ifupdown/Makefile.am
index 9d0ad25..bc55978 100644 (file)
--- a/src/settings/plugins/ifupdown/Makefile.am
+++ b/src/settings/plugins/ifupdown/Makefile.am
@@ -1,5 +1,7 @@
 SUBDIRS = . tests
 
+@GNOME_CODE_COVERAGE_RULES@
+
 INCLUDES = \
        -I$(top_srcdir)/src/logging \
        -I$(top_srcdir)/src/settings \

diff --git a/src/settings/plugins/ifupdown/tests/Makefile.am b/src/settings/plugins/ifupdown/tests/Makefile.am
index 6bde26f..ec5e5db 100644 (file)
--- a/src/settings/plugins/ifupdown/tests/Makefile.am
+++ b/src/settings/plugins/ifupdown/tests/Makefile.am
@@ -6,12 +6,15 @@ INCLUDES = \
        -I$(top_srcdir)/libnm-util \
        -I$(top_builddir)/libnm-util \
        -I$(top_srcdir)/libnm-glib \
+       -I$(top_srcdir)/src/settings \
        -I$(srcdir)/../
 
 noinst_PROGRAMS = test-ifupdown
 
 test_ifupdown_SOURCES = \
-       test-ifupdown.c
+       test-ifupdown.c \
+       ../interface_parser.c \
+       ../parser.c
 
 test_ifupdown_CPPFLAGS = \
        $(GLIB_CFLAGS) \
@@ -21,7 +24,6 @@ test_ifupdown_CPPFLAGS = \
 test_ifupdown_LDADD = \
        $(top_builddir)/libnm-glib/libnm-glib.la \
        $(top_builddir)/libnm-util/libnm-util.la \
-       $(builddir)/../libifupdown-io.la \
        $(DBUS_LIBS)
 
 check-local: test-ifupdown

diff --git a/src/settings/plugins/keyfile/Makefile.am b/src/settings/plugins/keyfile/Makefile.am
index a9fbb66..ab91f8b 100644 (file)
--- a/src/settings/plugins/keyfile/Makefile.am
+++ b/src/settings/plugins/keyfile/Makefile.am
@@ -1,5 +1,7 @@
 SUBDIRS = . tests
 
+@GNOME_CODE_COVERAGE_RULES@
+
 INCLUDES = \
        -I$(top_srcdir)/src/settings \
        -I$(top_srcdir)/include \

diff --git a/src/settings/plugins/keyfile/tests/Makefile.am b/src/settings/plugins/keyfile/tests/Makefile.am
index 26e8eaf..0d0f239 100644 (file)
--- a/src/settings/plugins/keyfile/tests/Makefile.am
+++ b/src/settings/plugins/keyfile/tests/Makefile.am
@@ -2,30 +2,39 @@ if ENABLE_TESTS
 
 SUBDIRS=keyfiles
 
+@GNOME_CODE_COVERAGE_RULES@
+
 INCLUDES = \
        -I$(top_srcdir)/include \
        -I$(top_builddir)/include \
        -I$(top_srcdir)/libnm-util \
        -I$(top_builddir)/libnm-util \
        -I$(top_srcdir)/libnm-glib \
+       -I$(top_srcdir)/src/settings \
        -I$(srcdir)/../
 
 noinst_PROGRAMS = test-keyfile
 
 test_keyfile_SOURCES = \
-       test-keyfile.c
+       test-keyfile.c \
+       ../reader.c \
+       ../writer.c \
+       ../errors.c \
+       ../utils.c
 
 test_keyfile_CPPFLAGS = \
        $(GLIB_CFLAGS) \
        $(DBUS_CFLAGS) \
+       $(CODE_COVERAGE_CFLAGS) \
        -DTEST_KEYFILES_DIR=\"$(abs_srcdir)/keyfiles\" \
-       -DTEST_SCRATCH_DIR=\"$(abs_builddir)/keyfiles\"
+       -DTEST_SCRATCH_DIR=\"$(abs_builddir)/keyfiles\" \
+       -DNMCONFDIR=\"nonexistent\"
 
 test_keyfile_LDADD = \
-       $(builddir)/../libkeyfile-io.la \
        $(top_builddir)/libnm-glib/libnm-glib.la \
        $(top_builddir)/libnm-util/libnm-util.la \
-       $(DBUS_LIBS)
+       $(DBUS_LIBS) \
+       $(CODE_COVERAGE_LDFLAGS)
 
 check-local: test-keyfile
        $(abs_builddir)/test-keyfile