harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smish...@apache.org
Subject svn commit: r545434 - in /harmony/enhanced/buildtest/branches/2.0/scripts: cc-exec-adaptor.xml cc-project.xml framework.properties
Date Fri, 08 Jun 2007 06:22:33 GMT
Author: smishura
Date: Thu Jun  7 23:22:32 2007
New Revision: 545434

URL: http://svn.apache.org/viewvc?view=rev&rev=545434
Log:
Apply patch from HARMONY-3501 for execution logs that are avaliable via CC web-interface

Modified:
    harmony/enhanced/buildtest/branches/2.0/scripts/cc-exec-adaptor.xml
    harmony/enhanced/buildtest/branches/2.0/scripts/cc-project.xml
    harmony/enhanced/buildtest/branches/2.0/scripts/framework.properties

Modified: harmony/enhanced/buildtest/branches/2.0/scripts/cc-exec-adaptor.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/scripts/cc-exec-adaptor.xml?view=diff&rev=545434&r1=545433&r2=545434
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/scripts/cc-exec-adaptor.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/scripts/cc-exec-adaptor.xml Thu Jun  7 23:22:32
2007
@@ -67,18 +67,26 @@
         </then>
         </if>
 
+        <echo file="${cc.execution.log.file}" 
+              message="&lt;html>&lt;body>"/>
+        <echo file="${cc.execution.log.file}" append="true"
+              message="&lt;pre>&lt;a style='font-size: 80%;'>"/>
+        <record name="${cc.execution.log.file}" append="yes" action="start"/>
         <trycatch property="exception" reference="execution.exception.ref">
         <try>
             <ant dir="${root.dir}/adaptors/${suite.name}" 
                  antfile="adaptor.xml" 
                  target="run"
                  inheritAll="true"/>
+            <record name="${cc.execution.log.file}" action="stop"/>
         </try>
         <catch>
+            <record name="${cc.execution.log.file}" emacsmode="true"/>
             <echo>
-Test Suite '${suite.name}' Execution FAILED with the following exception:
+The execution FAILED with the following exception:
 ${exception}
 </echo>
+            <record name="${cc.execution.log.file}" action="stop"/>
             <!-- write 'failed' status -->
             <propertyfile file="${cc.execution.status.file}"
                           comment="${cc.execution.status.file.header}.">
@@ -86,6 +94,10 @@
             </propertyfile>
         </catch>
         </trycatch>
+        <echo file="${cc.execution.log.file}" append="true" 
+              message="&lt;/a>&lt;/pre>"/>
+        <echo file="${cc.execution.log.file}" append="true" 
+              message="&lt;/body>&lt;/html>"/>
         <fail message="${exception}" if="exception"/>
     </target>
 

Modified: harmony/enhanced/buildtest/branches/2.0/scripts/cc-project.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/scripts/cc-project.xml?view=diff&rev=545434&r1=545433&r2=545434
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/scripts/cc-project.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/scripts/cc-project.xml Thu Jun  7 23:22:32 2007
@@ -40,7 +40,7 @@
         </sequential>
     </target>
     
-    <target name="create-cc-configuration" depends="-prepare-cc, init-framework, init-suites">
+    <target name="create-cc-configuration" depends="define-tasks, -prepare-cc, init-framework,
init-suites">
         <!-- Create Main CC Configuration File -->
         <delete file="${cc.config.file}"/>
         <copy file="${cc.config.template}" 
@@ -198,6 +198,9 @@
                     </if>
                 </then>
                 </if>
+                <insert-execution_logs-publisher
+                    suite="@{suite.name}"
+                    ccfile="${@{suite.name}.parameters.cc.file.location}"/>
                 <!-- insert test results to be merged into log -->
                 <if>
                     <isset property="@{suite.name}.parameters.cc.results"/>
@@ -558,7 +561,22 @@
                &lt;property name='publisher.location' value='@{publisher}'/&gt;@NL@
                &lt;property name='properties.dump.file'@NL@
                          value='@{antpropsfile}'/&gt;@NL@
-           &lt;/antpublisher&gt;@NL@"/>
+           &lt;/antpublisher&gt;@NL@
+           &lt;!-- @BT.PUBLISHER@ --&gt;"/>
+            </replace>
+        </sequential>
+    </macrodef>
+
+    <macrodef name="insert-execution_logs-publisher">
+        <attribute name="suite"/>
+        <attribute name="ccfile"/>
+        <sequential>
+            <replace file="@{ccfile}">
+                <replacefilter 
+                    token="&lt;!-- @BT.PUBLISHER@ --&gt;"
+                    value="&lt;artifactspublisher@NL@
+                file='${cc.execution.log.file}'@NL@
+                dest='${cc.log.dir}/@{suite}'/>"/>
             </replace>
         </sequential>
     </macrodef>

Modified: harmony/enhanced/buildtest/branches/2.0/scripts/framework.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/scripts/framework.properties?view=diff&rev=545434&r1=545433&r2=545434
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/scripts/framework.properties (original)
+++ harmony/enhanced/buildtest/branches/2.0/scripts/framework.properties Thu Jun  7 23:22:32
2007
@@ -23,4 +23,5 @@
 cc.project.execution.timeout=5000000
 cc.execution.status.file=${cc.work.dir}/execution.status
 cc.execution.status.file.header=\ Autogenerated file used for Test Suites execution status
checking.
+cc.execution.log.file=${cc.work.dir}/execution_log.html
 



Mime
View raw message