Merge lp:~cyphermox/bamf/fix-tests-gtester2xunit into lp:bamf

[Mathieu Trudel-Lapierre]

Fix test-libbamf to properly call gtester2xunit.

Fix test-libbamf to properly call gtester2xunit.

[Didier Roche-Tolomelli (didrocks)]

looks good and tested by Mathieu. Thanks!

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:537
http://jenkins.qa.ubuntu.com/job/bamf-ci/33/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/bamf-saucy-amd64-ci/14
    SUCCESS: http://jenkins.qa.ubuntu.com/job/bamf-saucy-armhf-ci/14

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

review: Approve (continuous-integration)

=== modified file 'tests/Makefile.am.gtests'
--- tests/Makefile.am.gtests	2013-05-31 16:45:50 +0000
+++ tests/Makefile.am.gtests	2013-06-04 20:00:35 +0000
@@ -37,7 +37,7 @@
 
 test:
 	@gtester -k --verbose -o=$(TEST_BINARY)-results.xml ./$(TEST_BINARY); \
-	$(GTESTER2XUNIT_RUN) $(TEST_BINARY)-results.xml
+	$(GTESTER2XUNIT_RUN) --xsl $(abs_top_srcdir)/tests/gtester.xsl $(TEST_BINARY)-results.xml
 
 .PHONY: check-report full-report
 check-report: $(TEST_BINARY)

=== added file 'tests/gtester.xsl'
--- tests/gtester.xsl	1970-01-01 00:00:00 +0000
+++ tests/gtester.xsl	2013-06-04 20:00:35 +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>

=== modified file 'tests/gtester2xunit.py'
--- tests/gtester2xunit.py	2013-05-31 16:45:50 +0000
+++ tests/gtester2xunit.py	2013-06-04 20:00:35 +0000
@@ -6,8 +6,6 @@
 import os
 
 XSL_TRANSFORM='/usr/share/gtester2xunit/gtester.xsl'
-#XSL_TRANSFORM='./gtester.xsl'
-
 
 def transform_file(input_filename, output_filename, xsl_file):
     gtester = libxml2.parseFile(xsl_file)