Merge lp:~3v1n0/bamf/xunit-coverage-fixes-0.4 into lp:bamf/0.4

[Marco Trevisan (Treviño)]

Makefile.am.gtests, Makefile.am.coverage: add missing entries to allow building in jenkins

Backporting changes introduced in trunk with lp:~3v1n0/bamf/libbamf-load-favorites-sticky-values and lp:~3v1n0/bamf/libbamf-private that allows to correctly build in jenkins.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:542
http://jenkins.qa.ubuntu.com/job/bamf-0.4-ci/7/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/bamf-0.4-raring-amd64-ci/7
    SUCCESS: http://jenkins.qa.ubuntu.com/job/bamf-0.4-raring-armhf-ci/7

Click here to trigger a rebuild:
http://s-jenkins:8080/job/bamf-0.4-ci/7/rebuild

review: Approve (continuous-integration)

[Francis Ginther (fginther)]

Builds and produces the expected test and coverage files.

review: Approve

=== modified file 'Makefile.am.coverage'
--- Makefile.am.coverage	2012-12-13 21:54:59 +0000
+++ Makefile.am.coverage	2013-06-08 17:29:27 +0000
@@ -7,8 +7,6 @@
 
 clean-local: clean-gcno clean-coverage-html clean-coverage-gcovr
 
-if HAVE_GCOV
-
 clean-gcno:
 	@echo Removing old coverage instrumentation
 	-find -name '*.gcno' -print | xargs -r rm
@@ -16,7 +14,8 @@
 clean-gcda:
 	@echo Removing old coverage results
 	-find -name '*.gcda' -print | xargs -r rm
-  
+
+if HAVE_GCOV
 coverage-html:
 	-$(MAKE) $(AM_MAKEFLAGS) -k check
 	$(MAKE) $(AM_MAKEFLAGS) generate-coverage-html
@@ -35,14 +34,18 @@
 coverage-gcovr:
 	-$(MAKE) $(AM_MAKEFLAGS) -k check
 	$(MAKE) $(AM_MAKEFLAGS) generate-coverage-gcovr
-	
+
+coverage-xml: coverage-gcovr
+
 generate-coverage-gcovr:
 	@echo Generating coverage GCOVR report
-	$(GCOVR) --xml -r $(top_builddir) -o $(top_builddir)/coverage.xml
-	
-clean-coverage-gcovr: clean-gcda
-	-rm -rf $(top_builddir)/coverage.xml
+	$(GCOVR) --xml -r $(top_builddir) -e "tests.*" -o $(top_builddir)/coverage.xml
 
 endif # HAVE_GCOVR
 
 endif # HAVE_GCOV
+
+clean-coverage-gcovr: clean-gcda
+	-rm -f $(top_builddir)/coverage.xml
+
+clean-coverage-xml: clean-coverage-gcovr

=== modified file 'configure.ac'
--- configure.ac	2013-05-24 18:37:43 +0000
+++ configure.ac	2013-06-08 17:29:27 +0000
@@ -120,6 +120,18 @@
 AC_SUBST(LIBUNITY_WEBAPPS_LIBS)
 
 ###########################
+# gtester2xunit checks    #
+###########################
+
+AC_PATH_PROG([PYTHON],[python])
+AC_MSG_CHECKING(for gtester2xunit dependencies)
+if !($PYTHON -c "import libxslt, libxml2" 2> /dev/null); then
+  AC_MSG_RESULT([no])
+  AC_MSG_ERROR([You need to install python-libxslt1 and python-libxml2]);
+fi
+AC_MSG_RESULT([yes])
+
+###########################
 # Headless tests
 ###########################
 AC_ARG_ENABLE([headless-tests],

=== modified file 'debian/control'
--- debian/control	2013-05-01 23:03:44 +0000
+++ debian/control	2013-06-08 17:29:27 +0000
@@ -16,6 +16,7 @@
                libunity-webapps-dev (>= 2.3.3),
                libwnck-3-dev (>= 3.4.5),
                libgirepository1.0-dev,
+               python-libxslt1,
                valac,
                xvfb,
 Standards-Version: 3.9.3

=== modified file 'tests/Makefile.am'
--- tests/Makefile.am	2013-05-24 18:37:43 +0000
+++ tests/Makefile.am	2013-06-08 17:29:27 +0000
@@ -7,4 +7,6 @@
 EXTRA_DIST = \
 	data \
 	run-xvfb.sh \
+	gtester2xunit.py \
+	gtester.xsl \
 	$(NULL)

=== modified file 'tests/Makefile.am.gtests'
--- tests/Makefile.am.gtests	2013-05-30 22:44:37 +0000
+++ tests/Makefile.am.gtests	2013-06-08 17:29:27 +0000
@@ -3,9 +3,11 @@
 #
 # Author: Marco Trevisan <[e-mail]>
 
+GTESTER2XUNIT_RUN = $(abs_top_srcdir)/tests/gtester2xunit.py
+
 # Run tests as part of make check
+
 if ENABLE_HEADLESS_TESTS
-check-local: test-headless
 
 XVFB_RUN = $(abs_top_srcdir)/tests/run-xvfb.sh
 LOG_PATH = headless-logs
@@ -22,15 +24,20 @@
 	$(DBUS_LAUNCH) > $(LOG_PATH)/sessionbus.sh; \
 	source $(LOG_PATH)/sessionbus.sh; \
 	\
-	make test;
-# END HEADLESS TESTS
-else
+	make $(AM_MAKEFLAGS) -k test
+
+check-local: test-headless
+
+else # END HEADLESS TESTS
+
 check-local: test
+
 endif
 
 
 test:
-	@gtester -k --verbose -o=$(TEST_BINARY)-results.xml ./$(TEST_BINARY)
+	@gtester -k --verbose -o=$(TEST_BINARY)-results.xml ./$(TEST_BINARY); \
+	$(GTESTER2XUNIT_RUN) -x $(abs_top_srcdir)/tests/gtester.xsl $(TEST_BINARY)-results.xml
 
 .PHONY: check-report full-report
 check-report: $(TEST_BINARY)
@@ -47,4 +54,4 @@
 	      > $(TEST_BINARY)-results.html )
 
 clean-generic:
-	rm -f $(TEST_BINARY)-results.xml $(TEST_BINARY)-results.html
+	rm -f $(TEST_BINARY)-results*.xml $(TEST_BINARY)-results.html

=== modified file 'tests/bamfdaemon/Makefile.am'
--- tests/bamfdaemon/Makefile.am	2013-05-24 17:59:23 +0000
+++ tests/bamfdaemon/Makefile.am	2013-06-08 17:29:27 +0000
@@ -78,6 +78,7 @@
   -I$(top_builddir)/src \
   -DWNCK_I_KNOW_THIS_IS_UNSTABLE \
   -DTESTDIR=\""$(abs_top_srcdir)/tests"\" \
+  $(COVERAGE_CFLAGS) \
   $(GCC_FLAGS) \
   $(GTK_CFLAGS) \
   $(GLIB_CFLAGS) \
@@ -92,10 +93,11 @@
   $(WNCK_LIBS) \
   $(GTOP_LIBS) \
   $(GTK_LIBS) \
-  $(LIBUNITY_WEBAPPS_LIBS) 
+  $(LIBUNITY_WEBAPPS_LIBS)
 
 test_bamf_LDFLAGS = \
 		-Xlinker -export-dynamic -Wl,-O1 -Wl,-Bsymbolic-functions \
+		$(COVERAGE_LDFLAGS) \
 		$(NULL)
 
 EXTRA_DIST = \

=== added file 'tests/gtester.xsl'
--- tests/gtester.xsl	1970-01-01 00:00:00 +0000
+++ tests/gtester.xsl	2013-06-08 17:29:27 +0000
@@ -0,0 +1,69 @@
+<?xml version="1.0"?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+    
+    <!-- I can't believe I have to do this -->
+    <!-- Based on this code:
+            http://geekswithblogs.net/Erik/archive/2008/04/01/120915.aspx
+    -->
+    <xsl:template name="strreplace">
+        <xsl:param name="string"/>
+        <xsl:param name="token"/>
+        <xsl:param name="newtoken"/>
+        <xsl:choose>
+            <xsl:when test="contains($string, $token)">
+                <xsl:value-of select="substring-before($string, $token)"/>
+                <xsl:value-of select="$newtoken"/>
+                <xsl:call-template name="strreplace">
+                    <xsl:with-param name="string" select="substring-after($string, $token)"/>
+                    <xsl:with-param name="token" select="$token"/>
+                    <xsl:with-param name="newtoken" select="$newtoken"/>
+                </xsl:call-template>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:value-of select="$string"/>
+            </xsl:otherwise>
+        </xsl:choose>
+    </xsl:template>
+
+    <xsl:template match="/">
+        <xsl:for-each select="gtester">
+            <testsuite>
+                <xsl:attribute name="name">
+                    <xsl:value-of select="testbinary[1]/@path"/>
+                </xsl:attribute>
+                <xsl:attribute name="tests">
+                    <xsl:value-of select="count(testbinary[1]/testcase)"/>
+                </xsl:attribute>
+                <xsl:attribute name="time">
+                    <xsl:value-of select="sum(testbinary[1]/testcase/duration)"/>
+                </xsl:attribute>
+                <xsl:attribute name="failures">
+                    <xsl:value-of select="count(testbinary[1]/testcase/status[@result='failed'])"/>
+                </xsl:attribute>
+                <xsl:for-each select="testbinary[1]/testcase">
+                    <testcase>
+                        <xsl:variable name="classname">
+                            <xsl:call-template name="strreplace">
+                                <xsl:with-param name="string" select="substring-after(@path, '/')"/>
+                                <xsl:with-param name="token" select="'/'"/>
+                                <xsl:with-param name="newtoken" select="'.'"/>
+                            </xsl:call-template>
+                        </xsl:variable>
+                        <xsl:attribute name="classname">
+                            <xsl:value-of select="$classname"/>
+                        </xsl:attribute>
+                        <xsl:attribute name="name">g_test</xsl:attribute>
+                        <xsl:attribute name="time">
+                            <xsl:value-of select="duration"/>
+                        </xsl:attribute>
+                        <xsl:if test="status[@result = 'failed']">
+                            <failure>
+                                <xsl:value-of select="error"/>
+                            </failure>
+                        </xsl:if>
+                    </testcase>
+                </xsl:for-each>
+            </testsuite>
+        </xsl:for-each>
+    </xsl:template>
+</xsl:stylesheet>

=== added file 'tests/gtester2xunit.py'
--- tests/gtester2xunit.py	1970-01-01 00:00:00 +0000
+++ tests/gtester2xunit.py	2013-06-08 17:29:27 +0000
@@ -0,0 +1,54 @@
+#! /usr/bin/python
+from argparse import ArgumentParser
+import libxslt
+import libxml2
+import sys
+import os
+
+XSL_TRANSFORM='/usr/share/gtester2xunit/gtester.xsl'
+
+def transform_file(input_filename, output_filename, xsl_file):
+    gtester = libxml2.parseFile(xsl_file)
+    style = libxslt.parseStylesheetDoc(gtester)
+    doc = libxml2.parseFile(input_filename)
+    result = style.applyStylesheet(doc, None)
+    result.saveFormatFile(filename=output_filename, format=True)
+
+
+def get_output_filename(input_filename):
+    filename, extension = os.path.splitext(input_filename)
+    return '{filename}-xunit{extension}'.format(filename=filename,
+                                                 extension=extension)
+
+def main():
+    parser = ArgumentParser(
+            description="Simple utility that converts xml output of " +
+                        "gtester to xunit output for jenkins")
+    parser.add_argument('-o', '--output', 
+            help="Write output to specified file instead of default")
+    parser.add_argument('-x', '--xsl', 
+            help="xsl file that should be used for the transformation")
+    parser.add_argument('-i', '--in-place', 
+            help="Write the ouput to the original file (i.e. replace " +
+            "the original xml)",
+            action='store_true',
+            default=False)
+    parser.add_argument('files', metavar='FILE', type=str, nargs='+',
+            help="file(s) to transform to xunit format")
+    args = vars(parser.parse_args())
+    for input_filename in args['files']:
+        if not args['output']:
+            if args['in_place']:
+                output_filename = input_filename
+            else:
+                output_filename = get_output_filename(input_filename)
+        else:
+            output_filename = args['output']
+        if not args['xsl']:
+            xsl = XSL_TRANSFORM
+        else:
+            xsl = args['xsl']
+        transform_file(input_filename, output_filename, xsl)
+    
+sys.exit(main())
+# vim: set syntex=python:

=== modified file 'tests/libbamf/Makefile.am'
--- tests/libbamf/Makefile.am	2013-05-30 22:44:04 +0000
+++ tests/libbamf/Makefile.am	2013-06-08 17:29:27 +0000
@@ -12,6 +12,7 @@
   -I$(top_srcdir)/lib/libbamf \
   -I$(top_builddir)/lib/libbamf \
   -DTESTDIR=\""$(abs_top_srcdir)/tests"\" \
+  $(COVERAGE_CFLAGS) \
   $(GCC_FLAGS) \
   $(DBUS_CFLAGS) \
   $(GTK_CFLAGS) \
@@ -19,6 +20,7 @@
 
 test_libbamf_LDADD = \
   $(top_builddir)/lib/libbamf/libbamf$(LIBBAMF_VER).la \
+  $(COVERAGE_LDFLAGS) \
   $(GLIB_LIBS) \
   $(GTK_LIBS) \
   $(DBUS_LIBS)