From d3b729db22b0f101711cc19cd0352912a42b4e98 Mon Sep 17 00:00:00 2001
From: zdenekc <zdenekc@64e312b2-a51f-0410-8e61-82d0ca0eb02a>
Date: Mon, 21 Feb 2011 08:02:16 +0000
Subject: [PATCH] * add link to xslt to xml output, add display of iteration in
 stylesheet and   move it to web page root

git-svn-id: svn+ssh://svn.code.sf.net/p/check/code/trunk@601 64e312b2-a51f-0410-8e61-82d0ca0eb02a
---
 Makefile.am                          | 2 +-
 NEWS                                 | 3 +++
 src/check_log.c                      | 1 +
 tests/test_xml_output.sh             | 1 +
 {contrib => xml}/check_unittest.xslt | 6 +++++-
 5 files changed, 11 insertions(+), 2 deletions(-)
 rename {contrib => xml}/check_unittest.xslt (94%)

diff --git a/Makefile.am b/Makefile.am
index 96f63e2..78f041e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,7 +16,7 @@ CLEANFILES = *~\
 
 ## what additional things to distribute
 
-EXTRA_DIST = SVNChangeLog ChangeLogOld check.pc.in $(m4data_DATA)
+EXTRA_DIST = SVNChangeLog ChangeLogOld check.pc.in $(m4data_DATA) xml/check_unittest.xslt
 
 ## install docs
 docdir = $(datadir)/doc/$(PACKAGE)
diff --git a/NEWS b/NEWS
index bd3c897..dcdaa50 100644
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,9 @@ In development.
 * Added checkmk, a tool for reducing "boilerplate coding" when writing
   unit tests with check.
 
+* Added xslt link to xml output, added display of iteration field into xslt
+  stylesheet and moved it to directory accessible from web page root
+
 Tue, Sep 22, 2009: Released Check 0.9.8
   based on r559 (2009-09-23 21:00).
 
diff --git a/src/check_log.c b/src/check_log.c
index 6176675..9b735e1 100644
--- a/src/check_log.c
+++ b/src/check_log.c
@@ -238,6 +238,7 @@ void xml_lfun (SRunner *sr CK_ATTRIBUTE_UNUSED, FILE *file, enum print_output pr
   switch (evt) {
   case CLINITLOG_SR:
     fprintf(file, "<?xml version=\"1.0\"?>\n");
+    fprintf(file, "<?xml-stylesheet type=\"text/xsl\" href=\"http://check.sourceforge.net/xml/check_unittest.xslt\"?>\n");
     fprintf(file, "<testsuites xmlns=\"http://check.sourceforge.net/ns\">\n");
     fprintf(file, "  <datetime>%s</datetime>\n", t);
     break;
diff --git a/tests/test_xml_output.sh b/tests/test_xml_output.sh
index 1662027..3cb4031 100755
--- a/tests/test_xml_output.sh
+++ b/tests/test_xml_output.sh
@@ -7,6 +7,7 @@ else
 fi
 
 expected="<?xml version=\"1.0\"?>
+<?xml-stylesheet type=\"text/xsl\" href=\"http://check.sourceforge.net/xml/check_unittest.xslt\"?>
 <testsuites xmlns=\"http://check.sourceforge.net/ns\">
   <suite>
     <title>S1</title>
diff --git a/contrib/check_unittest.xslt b/xml/check_unittest.xslt
similarity index 94%
rename from contrib/check_unittest.xslt
rename to xml/check_unittest.xslt
index 81b5984..25d9f98 100644
--- a/contrib/check_unittest.xslt
+++ b/xml/check_unittest.xslt
@@ -34,6 +34,7 @@ $ xsltproc check_unittest.xslt check_output.xml > check_output.html
   <td>Path</td>
   <td>Filename</td>
   <td>Test ID</td>
+  <td>Iteration</td>
   <td>Description</td>
   <td>Message</td>
   </tr>
@@ -67,6 +68,10 @@ $ xsltproc check_unittest.xslt check_output.xml > check_output.html
   <td><xsl:apply-templates/></td>
 </xsl:template>
 
+<xsl:template match="c:iteration">
+  <td><xsl:apply-templates/></td>
+</xsl:template>
+
 <xsl:template match="c:description">
   <td><xsl:apply-templates/></td>
 </xsl:template>
@@ -81,4 +86,3 @@ $ xsltproc check_unittest.xslt check_output.xml > check_output.html
 
 </xsl:stylesheet>
 
- 	  	 
-- 
2.40.0