db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kahat...@apache.org
Subject svn commit: r1616476 - in /db/derby/code/branches/10.11: ./ build.xml tools/ant/xsl/sysinfo_junitreport.xsl
Date Thu, 07 Aug 2014 12:05:17 GMT
Author: kahatlen
Date: Thu Aug  7 12:05:17 2014
New Revision: 1616476

URL: http://svn.apache.org/r1616476
Log:
DERBY-2234: ant junitreport gives fatal error during transformation

Merged revision 1616112 from trunk.

Removed:
    db/derby/code/branches/10.11/tools/ant/xsl/sysinfo_junitreport.xsl
Modified:
    db/derby/code/branches/10.11/   (props changed)
    db/derby/code/branches/10.11/build.xml

Propchange: db/derby/code/branches/10.11/
------------------------------------------------------------------------------
  Merged /db/derby/code/trunk:r1616112

Modified: db/derby/code/branches/10.11/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.11/build.xml?rev=1616476&r1=1616475&r2=1616476&view=diff
==============================================================================
--- db/derby/code/branches/10.11/build.xml (original)
+++ db/derby/code/branches/10.11/build.xml Thu Aug  7 12:05:17 2014
@@ -2740,19 +2740,20 @@
       <report format="frames" todir="junit_${derby.junit.timestamp}"/>
     </junitreport>
 
-    <!-- fix up unterminated elements in overview-frame.html -->
-    <replace token="href=&quot;stylesheet.css&quot;&gt;"
-             value="href=&quot;stylesheet.css&quot;/&gt;&lt;/META&gt;"
-             file="junit_${derby.junit.timestamp}/overview-frame.html"/>
     <replace token="Unit Test Results"
              value="Apache Derby Test Results - ${derby.junit.standardtime}&lt;br&gt;JVM:
${java.vm.vendor} ${java.vm.version}"
              file="junit_${derby.junit.timestamp}/overview-summary.html"/>
 
-    <xslt style="${basedir}/tools/ant/xsl/sysinfo_junitreport.xsl"
-          in="junit_${derby.junit.timestamp}/overview-frame.html"
-          out="junit_${derby.junit.timestamp}/overview-frame2.html"/>
-    <move file="junit_${derby.junit.timestamp}/overview-frame2.html"
-          tofile="junit_${derby.junit.timestamp}/overview-frame.html"/>
+    <!--
+        Insert a link to sysinfo.txt after the first h2 element in
+        overview-frame.html. (We use the replaceregexp task instead of
+        the replace task since we want to replace the first occurrence
+        only. The replace task replaces all occurrences.)
+    -->
+    <replaceregexp
+        match="&lt;/h2&gt;"
+        replace="&lt;/h2&gt;&lt;h2&gt;&lt;a href=&quot;sysinfo.txt&quot;
target=&quot;classFrame&quot;&gt;sysinfo&lt;/a&gt;&lt;/h2&gt;"
+        file="junit_${derby.junit.timestamp}/overview-frame.html"/>
   	
   	<fail if="tests.failed">Tests Failed!</fail>
   </target>



Mime
View raw message