* 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

diff --git a/Makefile.am b/Makefile.am
index 96f63e28c949d82a1c7e37e3c903532e18528ab3..78f041e969b0b8720e9973de21660a3f6d932467 100644 (file)
--- 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 bd3c897ae380d7c1028dd84781fe0ed062a6b2b4..dcdaa50040e89062fcf83d3ca62cfb3eaf27edaf 100644 (file)
--- 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 6176675aa73c32acf06d876e49cf937750381d0c..9b735e11409a1f21c80c4fe0a2919335e7c4761c 100644 (file)
--- 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 166202763f62f3333c4760f702d57a9003a2799d..3cb403161aa4708765bd12791f8f4ab875102984 100755 (executable)
--- 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 81b5984d61c37b12f21687b5512e3291e1af6263..25d9f98b6fbff8b606dacc68c36f90ee9f021b3b 100644 (file)
--- 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>
 
-