diff options
Diffstat (limited to 'libwmc')
-rw-r--r-- | libwmc/Makefile.in | 20 | ||||
-rw-r--r-- | libwmc/src/Makefile.in | 20 | ||||
-rw-r--r-- | libwmc/tests/Makefile.am | 18 | ||||
-rw-r--r-- | libwmc/tests/Makefile.in | 181 | ||||
-rw-r--r-- | libwmc/tests/test-wmc.c | 5 |
5 files changed, 152 insertions, 92 deletions
diff --git a/libwmc/Makefile.in b/libwmc/Makefile.in index 2943087..3f52235 100644 --- a/libwmc/Makefile.in +++ b/libwmc/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -187,8 +187,6 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -212,7 +210,6 @@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ @@ -229,7 +226,6 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ @@ -261,14 +257,20 @@ MANIFEST_TOOL = @MANIFEST_TOOL@ MBIM_CFLAGS = @MBIM_CFLAGS@ MBIM_LIBS = @MBIM_LIBS@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MMCLI_CFLAGS = @MMCLI_CFLAGS@ MMCLI_LIBS = @MMCLI_LIBS@ MM_CFLAGS = @MM_CFLAGS@ +MM_DEFAULT_USER_POLICY = @MM_DEFAULT_USER_POLICY@ +MM_GLIB_LT_AGE = @MM_GLIB_LT_AGE@ +MM_GLIB_LT_CURRENT = @MM_GLIB_LT_CURRENT@ +MM_GLIB_LT_REVISION = @MM_GLIB_LT_REVISION@ MM_LIBS = @MM_LIBS@ +MM_MAJOR_VERSION = @MM_MAJOR_VERSION@ +MM_MICRO_VERSION = @MM_MICRO_VERSION@ +MM_MINOR_VERSION = @MM_MINOR_VERSION@ +MM_VERSION = @MM_VERSION@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ -MSGFMT_OPTS = @MSGFMT_OPTS@ MSGMERGE = @MSGMERGE@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -287,13 +289,9 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -POFILES = @POFILES@ POLKIT_CFLAGS = @POLKIT_CFLAGS@ POLKIT_LIBS = @POLKIT_LIBS@ POSUB = @POSUB@ -PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ -PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@ QMI_CFLAGS = @QMI_CFLAGS@ QMI_LIBS = @QMI_LIBS@ RANLIB = @RANLIB@ diff --git a/libwmc/src/Makefile.in b/libwmc/src/Makefile.in index 5ae8b42..22bc8bc 100644 --- a/libwmc/src/Makefile.in +++ b/libwmc/src/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -178,8 +178,6 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -203,7 +201,6 @@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ @@ -220,7 +217,6 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ @@ -252,14 +248,20 @@ MANIFEST_TOOL = @MANIFEST_TOOL@ MBIM_CFLAGS = @MBIM_CFLAGS@ MBIM_LIBS = @MBIM_LIBS@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MMCLI_CFLAGS = @MMCLI_CFLAGS@ MMCLI_LIBS = @MMCLI_LIBS@ MM_CFLAGS = @MM_CFLAGS@ +MM_DEFAULT_USER_POLICY = @MM_DEFAULT_USER_POLICY@ +MM_GLIB_LT_AGE = @MM_GLIB_LT_AGE@ +MM_GLIB_LT_CURRENT = @MM_GLIB_LT_CURRENT@ +MM_GLIB_LT_REVISION = @MM_GLIB_LT_REVISION@ MM_LIBS = @MM_LIBS@ +MM_MAJOR_VERSION = @MM_MAJOR_VERSION@ +MM_MICRO_VERSION = @MM_MICRO_VERSION@ +MM_MINOR_VERSION = @MM_MINOR_VERSION@ +MM_VERSION = @MM_VERSION@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ -MSGFMT_OPTS = @MSGFMT_OPTS@ MSGMERGE = @MSGMERGE@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -278,13 +280,9 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -POFILES = @POFILES@ POLKIT_CFLAGS = @POLKIT_CFLAGS@ POLKIT_LIBS = @POLKIT_LIBS@ POSUB = @POSUB@ -PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ -PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@ QMI_CFLAGS = @QMI_CFLAGS@ QMI_LIBS = @QMI_LIBS@ RANLIB = @RANLIB@ diff --git a/libwmc/tests/Makefile.am b/libwmc/tests/Makefile.am index ee98887..09141a0 100644 --- a/libwmc/tests/Makefile.am +++ b/libwmc/tests/Makefile.am @@ -1,11 +1,12 @@ -if WITH_TESTS +include $(top_srcdir)/gtester.make + +noinst_PROGRAMS = test-wmc +TEST_PROGS += $(noinst_PROGRAMS) INCLUDES = \ -I$(top_srcdir)/libwmc/src \ -I$(top_srcdir)/src -noinst_PROGRAMS = test-wmc - test_wmc_SOURCES = \ test-wmc-crc.c \ test-wmc-crc.h \ @@ -16,10 +17,7 @@ test_wmc_SOURCES = \ test-wmc-com.c \ test-wmc-com.h \ test-wmc.c - -test_wmc_CPPFLAGS = \ - $(MM_CFLAGS) - +test_wmc_CPPFLAGS = $(MM_CFLAGS) test_wmc_LDADD = $(MM_LIBS) if WMC_STANDALONE @@ -27,9 +25,3 @@ test_wmc_LDADD += $(top_builddir)/src/libwmc.la else test_wmc_LDADD += $(top_builddir)/libwmc/src/libwmc.la endif - -check-local: test-wmc - $(abs_builddir)/test-wmc - -endif - diff --git a/libwmc/tests/Makefile.in b/libwmc/tests/Makefile.in index c6cb279..36f4376 100644 --- a/libwmc/tests/Makefile.in +++ b/libwmc/tests/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -78,12 +78,12 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -@WITH_TESTS_TRUE@noinst_PROGRAMS = test-wmc$(EXEEXT) -@WITH_TESTS_TRUE@@WMC_STANDALONE_TRUE@am__append_1 = $(top_builddir)/src/libwmc.la -@WITH_TESTS_TRUE@@WMC_STANDALONE_FALSE@am__append_2 = $(top_builddir)/libwmc/src/libwmc.la +DIST_COMMON = $(top_srcdir)/gtester.make $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/depcomp +noinst_PROGRAMS = test-wmc$(EXEEXT) +@WMC_STANDALONE_TRUE@am__append_1 = $(top_builddir)/src/libwmc.la +@WMC_STANDALONE_FALSE@am__append_2 = $(top_builddir)/libwmc/src/libwmc.la subdir = libwmc/tests -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \ @@ -102,19 +102,14 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = PROGRAMS = $(noinst_PROGRAMS) -am__test_wmc_SOURCES_DIST = test-wmc-crc.c test-wmc-crc.h \ - test-wmc-escaping.c test-wmc-escaping.h test-wmc-utils.c \ - test-wmc-utils.h test-wmc-com.c test-wmc-com.h test-wmc.c -@WITH_TESTS_TRUE@am_test_wmc_OBJECTS = \ -@WITH_TESTS_TRUE@ test_wmc-test-wmc-crc.$(OBJEXT) \ -@WITH_TESTS_TRUE@ test_wmc-test-wmc-escaping.$(OBJEXT) \ -@WITH_TESTS_TRUE@ test_wmc-test-wmc-utils.$(OBJEXT) \ -@WITH_TESTS_TRUE@ test_wmc-test-wmc-com.$(OBJEXT) \ -@WITH_TESTS_TRUE@ test_wmc-test-wmc.$(OBJEXT) +am_test_wmc_OBJECTS = test_wmc-test-wmc-crc.$(OBJEXT) \ + test_wmc-test-wmc-escaping.$(OBJEXT) \ + test_wmc-test-wmc-utils.$(OBJEXT) \ + test_wmc-test-wmc-com.$(OBJEXT) test_wmc-test-wmc.$(OBJEXT) test_wmc_OBJECTS = $(am_test_wmc_OBJECTS) am__DEPENDENCIES_1 = -@WITH_TESTS_TRUE@test_wmc_DEPENDENCIES = $(am__DEPENDENCIES_1) \ -@WITH_TESTS_TRUE@ $(am__append_1) $(am__append_2) +test_wmc_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__append_1) \ + $(am__append_2) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent @@ -154,7 +149,7 @@ am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; am__v_CCLD_1 = SOURCES = $(test_wmc_SOURCES) -DIST_SOURCES = $(am__test_wmc_SOURCES_DIST) +DIST_SOURCES = $(test_wmc_SOURCES) am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -189,8 +184,6 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -214,7 +207,6 @@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ @@ -231,7 +223,6 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ @@ -263,14 +254,20 @@ MANIFEST_TOOL = @MANIFEST_TOOL@ MBIM_CFLAGS = @MBIM_CFLAGS@ MBIM_LIBS = @MBIM_LIBS@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MMCLI_CFLAGS = @MMCLI_CFLAGS@ MMCLI_LIBS = @MMCLI_LIBS@ MM_CFLAGS = @MM_CFLAGS@ +MM_DEFAULT_USER_POLICY = @MM_DEFAULT_USER_POLICY@ +MM_GLIB_LT_AGE = @MM_GLIB_LT_AGE@ +MM_GLIB_LT_CURRENT = @MM_GLIB_LT_CURRENT@ +MM_GLIB_LT_REVISION = @MM_GLIB_LT_REVISION@ MM_LIBS = @MM_LIBS@ +MM_MAJOR_VERSION = @MM_MAJOR_VERSION@ +MM_MICRO_VERSION = @MM_MICRO_VERSION@ +MM_MINOR_VERSION = @MM_MINOR_VERSION@ +MM_VERSION = @MM_VERSION@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ -MSGFMT_OPTS = @MSGFMT_OPTS@ MSGMERGE = @MSGMERGE@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -289,13 +286,9 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -POFILES = @POFILES@ POLKIT_CFLAGS = @POLKIT_CFLAGS@ POLKIT_LIBS = @POLKIT_LIBS@ POSUB = @POSUB@ -PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ -PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@ QMI_CFLAGS = @QMI_CFLAGS@ QMI_LIBS = @QMI_LIBS@ RANLIB = @RANLIB@ @@ -364,31 +357,34 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -@WITH_TESTS_TRUE@INCLUDES = \ -@WITH_TESTS_TRUE@ -I$(top_srcdir)/libwmc/src \ -@WITH_TESTS_TRUE@ -I$(top_srcdir)/src - -@WITH_TESTS_TRUE@test_wmc_SOURCES = \ -@WITH_TESTS_TRUE@ test-wmc-crc.c \ -@WITH_TESTS_TRUE@ test-wmc-crc.h \ -@WITH_TESTS_TRUE@ test-wmc-escaping.c \ -@WITH_TESTS_TRUE@ test-wmc-escaping.h \ -@WITH_TESTS_TRUE@ test-wmc-utils.c \ -@WITH_TESTS_TRUE@ test-wmc-utils.h \ -@WITH_TESTS_TRUE@ test-wmc-com.c \ -@WITH_TESTS_TRUE@ test-wmc-com.h \ -@WITH_TESTS_TRUE@ test-wmc.c - -@WITH_TESTS_TRUE@test_wmc_CPPFLAGS = \ -@WITH_TESTS_TRUE@ $(MM_CFLAGS) - -@WITH_TESTS_TRUE@test_wmc_LDADD = $(MM_LIBS) $(am__append_1) \ -@WITH_TESTS_TRUE@ $(am__append_2) +GTESTER = gtester +GTESTER_REPORT = gtester-report + +# initialize variables for unconditional += appending +EXTRA_DIST = +TEST_PROGS = $(noinst_PROGRAMS) +INCLUDES = \ + -I$(top_srcdir)/libwmc/src \ + -I$(top_srcdir)/src + +test_wmc_SOURCES = \ + test-wmc-crc.c \ + test-wmc-crc.h \ + test-wmc-escaping.c \ + test-wmc-escaping.h \ + test-wmc-utils.c \ + test-wmc-utils.h \ + test-wmc-com.c \ + test-wmc-com.h \ + test-wmc.c + +test_wmc_CPPFLAGS = $(MM_CFLAGS) +test_wmc_LDADD = $(MM_LIBS) $(am__append_1) $(am__append_2) all: all-am .SUFFIXES: .SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/gtester.make $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -409,6 +405,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/gtester.make: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -626,7 +623,6 @@ distdir: $(DISTFILES) || exit 1; \ fi; \ done -@WITH_TESTS_FALSE@check-local: check-am: all-am $(MAKE) $(AM_MAKEFLAGS) check-local check: check-am @@ -750,8 +746,89 @@ uninstall-am: tags tags-am uninstall uninstall-am -@WITH_TESTS_TRUE@check-local: test-wmc -@WITH_TESTS_TRUE@ $(abs_builddir)/test-wmc +### testing rules + +# test: run all tests in cwd and subdirs +test: test-nonrecursive + @ for subdir in $(SUBDIRS) . ; do \ + test "$$subdir" = "." -o "$$subdir" = "po" || \ + ( cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $@ ) || exit $? ; \ + done + +# test-nonrecursive: run tests only in cwd +test-nonrecursive: ${TEST_PROGS} + @test -z "${TEST_PROGS}" || G_DEBUG=gc-friendly MALLOC_CHECK_=2 MALLOC_PERTURB_=$$(($${RANDOM:-256} % 256)) ${GTESTER} --verbose ${TEST_PROGS} + +# test-report: run tests in subdirs and generate report +# perf-report: run tests in subdirs with -m perf and generate report +# full-report: like test-report: with -m perf and -m slow +test-report perf-report full-report: ${TEST_PROGS} + @test -z "${TEST_PROGS}" || { \ + case $@ in \ + test-report) test_options="-k";; \ + perf-report) test_options="-k -m=perf";; \ + full-report) test_options="-k -m=perf -m=slow";; \ + esac ; \ + if test -z "$$GTESTER_LOGDIR" ; then \ + ${GTESTER} --verbose $$test_options -o test-report.xml ${TEST_PROGS} ; \ + elif test -n "${TEST_PROGS}" ; then \ + ${GTESTER} --verbose $$test_options -o `mktemp "$$GTESTER_LOGDIR/log-XXXXXX"` ${TEST_PROGS} ; \ + fi ; \ + } + @ ignore_logdir=true ; \ + if test -z "$$GTESTER_LOGDIR" ; then \ + GTESTER_LOGDIR=`mktemp -d "\`pwd\`/.testlogs-XXXXXX"`; export GTESTER_LOGDIR ; \ + ignore_logdir=false ; \ + fi ; \ + if test -d "$(top_srcdir)/.git" ; then \ + REVISION=`git describe` ; \ + else \ + REVISION=$(VERSION) ; \ + fi ; \ + for subdir in $(SUBDIRS) . ; do \ + test "$$subdir" = "." -o "$$subdir" = "po" || \ + ( cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $@ ) || exit $? ; \ + done ; \ + $$ignore_logdir || { \ + echo '<?xml version="1.0"?>' > $@.xml ; \ + echo '<report-collection>' >> $@.xml ; \ + echo '<info>' >> $@.xml ; \ + echo ' <package>$(PACKAGE)</package>' >> $@.xml ; \ + echo ' <version>$(VERSION)</version>' >> $@.xml ; \ + echo " <revision>$$REVISION</revision>" >> $@.xml ; \ + echo '</info>' >> $@.xml ; \ + for lf in `ls -L "$$GTESTER_LOGDIR"/.` ; do \ + sed '1,1s/^<?xml\b[^>?]*?>//' <"$$GTESTER_LOGDIR"/"$$lf" >> $@.xml ; \ + done ; \ + echo >> $@.xml ; \ + echo '</report-collection>' >> $@.xml ; \ + rm -rf "$$GTESTER_LOGDIR"/ ; \ + ${GTESTER_REPORT} --version 2>/dev/null 1>&2 ; test "$$?" != 0 || ${GTESTER_REPORT} $@.xml >$@.html ; \ + } +.PHONY: test test-report perf-report full-report test-nonrecursive + +.PHONY: lcov genlcov lcov-clean +# use recursive makes in order to ignore errors during check +lcov: + -$(MAKE) $(AM_MAKEFLAGS) -k check + $(MAKE) $(AM_MAKEFLAGS) genlcov + +# we have to massage the lcov.info file slightly to hide the effect of libtool +# placing the objects files in the .libs/ directory separate from the *.c +# we also have to delete tests/.libs/libmoduletestplugin_*.gcda +genlcov: + rm -f $(top_builddir)/tests/.libs/libmoduletestplugin_*.gcda + $(LTP) --directory $(top_builddir) --capture --output-file glib-lcov.info --test-name GLIB_PERF --no-checksum --compat-libtool + LANG=C $(LTP_GENHTML) --prefix $(top_builddir) --output-directory glib-lcov --title "GLib Code Coverage" --legend --show-details glib-lcov.info + @echo "file://$(abs_top_builddir)/glib-lcov/index.html" + +lcov-clean: + -$(LTP) --directory $(top_builddir) -z + -rm -rf glib-lcov.info glib-lcov + -find -name '*.gcda' -print | xargs rm + +# run tests in cwd as part of make check +check-local: test-nonrecursive # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/libwmc/tests/test-wmc.c b/libwmc/tests/test-wmc.c index a0e2e9e..e1027b2 100644 --- a/libwmc/tests/test-wmc.c +++ b/libwmc/tests/test-wmc.c @@ -27,11 +27,7 @@ typedef struct { gpointer com_data; } TestData; -#if GLIB_CHECK_VERSION(2,25,12) typedef GTestFixtureFunc TCFunc; -#else -typedef void (*TCFunc)(void); -#endif #define TESTCASE(t, d) g_test_create_case (#t, 0, d, NULL, (TCFunc) t, NULL) @@ -112,4 +108,3 @@ int main (int argc, char **argv) return result; } - |