2008-11-28 Atsushi Enomoto <atsushi@ximian.com>

	* nunit-summary.xsl : copied from nunit resource (summary.xslt)
	* library.make : put transformation result from TestResult-*.xml
	  into TestResult-*.log as we used to do.

svn path=/trunk/mcs/; revision=120207

diff --git a/mcs/build/ChangeLog b/mcs/build/ChangeLog
index ecf7088f5ccf3983362e254973ac1a9fce05002a..bbe2c5de5755d79b3162b52fdb0f6de76c54fabe 100644 (file)
--- a/mcs/build/ChangeLog
+++ b/mcs/build/ChangeLog
@@ -1,3 +1,9 @@
+2008-11-28  Atsushi Enomoto  <atsushi@ximian.com>
+
+       * nunit-summary.xsl : copied from nunit resource (summary.xslt)
+       * library.make : put transformation result from TestResult-*.xml
+         into TestResult-*.log as we used to do.
+
 2008-11-28  Marek Habersack  <mhabersack@novell.com>
 
        * library.make (FIXTURE_ARG): /parameter:value syntax is not

diff --git a/mcs/build/library.make b/mcs/build/library.make
index 3218f7b5881bcc3a70ae634fad4649662131e76f..90f520fb3800c953858b55c525146a51a6717817 100644 (file)
--- a/mcs/build/library.make
+++ b/mcs/build/library.make
@@ -206,8 +206,8 @@ TEST_HARNESS_POSTPROC_ONDOTNET = :
 else
 TEST_HARNESS_OUTPUT = -output=TestResult-$(PROFILE).log
 TEST_HARNESS_OUTPUT_ONDOTNET = -output=TestResult-ondotnet-$(PROFILE).log
-TEST_HARNESS_POSTPROC = (echo ''; cat TestResult-$(PROFILE).log) | sed '1,/^Tests run: /d'
-TEST_HARNESS_POSTPROC_ONDOTNET = (echo ''; cat TestResult-ondotnet-$(PROFILE).log) | sed '1,/^Tests run: /d'
+TEST_HARNESS_POSTPROC = (echo ''; cat TestResult-$(PROFILE).log) | sed '1,/^Tests run: /d'; xsltproc $(topdir)/build/nunit-summary.xsl TestResult-$(PROFILE).xml >> TestResult-$(PROFILE).log
+TEST_HARNESS_POSTPROC_ONDOTNET = (echo ''; cat TestResult-ondotnet-$(PROFILE).log) | sed '1,/^Tests run: /d'; xsltproc $(topdir)/build/nunit-summary.xsl TestResult-ondotnet-$(PROFILE).xml >> TestResult-ondotnet-$(PROFILE).log
 endif
 
 ifdef FIXTURE

diff --git a/mcs/build/nunit-summary.xsl b/mcs/build/nunit-summary.xsl
new file mode 100644 (file)
index 0000000..70972ad
--- /dev/null
+++ b/mcs/build/nunit-summary.xsl
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<xsl:output method='text'/>
+
+<xsl:template match="/">
+       <xsl:apply-templates/>
+</xsl:template>
+
+<xsl:template match="test-results">
+<xsl:text>Tests run: </xsl:text>
+<xsl:value-of select="@total"/>
+<xsl:text>, Failures: </xsl:text>
+<xsl:value-of select="@failures"/>
+<xsl:text>, Not run: </xsl:text>
+<xsl:value-of select="@not-run"/>
+<xsl:text>, Time: </xsl:text>
+<xsl:value-of select="test-suite/@time"/>
+<xsl:text> seconds
+</xsl:text>
+<xsl:text>
+</xsl:text>
+
+<xsl:if test="//test-suite[failure]"><xsl:text>Test Fixture SetUp Failures:
+</xsl:text></xsl:if>
+<xsl:apply-templates select="//test-suite[failure]"/>
+<xsl:if test="//test-case[failure]"><xsl:text>Test Case Failures:
+</xsl:text></xsl:if>
+<xsl:apply-templates select="//test-case[failure]"/>
+<xsl:if test="//test-case[@executed='False']"><xsl:text>Tests not run:
+</xsl:text></xsl:if>
+<xsl:apply-templates select="//test-case[@executed='False']"/>
+<xsl:text disable-output-escaping='yes'>&#xD;&#xA;</xsl:text>
+</xsl:template>
+
+<xsl:template match="test-case|test-suite">
+       <xsl:value-of select="position()"/><xsl:text>) </xsl:text>
+       <xsl:value-of select="@name"/>
+       <xsl:text> : </xsl:text>
+       <xsl:value-of select="child::node()/message"/>
+<xsl:text disable-output-escaping='yes'>&#xD;&#xA;</xsl:text>
+       <xsl:if test="failure">
+               <xsl:value-of select="failure/stack-trace"/>
+<xsl:text>
+</xsl:text>
+       </xsl:if>
+</xsl:template>
+
+</xsl:stylesheet>