svn commit: r562326 - in /harmony/enhanced/buildtest/branches/2.0/scripts: cc-exec-adaptor.xml cc-project.xml publisher.xml

[va...@apache.org]

Author: varlax
Date: Thu Aug  2 21:39:26 2007
New Revision: 562326

URL: http://svn.apache.org/viewvc?view=rev&rev=562326
Log:
Applied HARMONY-4290 [testing] BTI lacks of support for custom bootstrappers

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/publisher.xml

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=562326&r1=562325&r2=562326
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/scripts/cc-exec-adaptor.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/scripts/cc-exec-adaptor.xml Thu Aug  2 21:39:26 2007
@@ -116,6 +116,18 @@
              inheritAll="true"/>
     </target>
     
+    <!-- Called from CC to execute custom bootstrapper -->
+    <target name="cc-bootstrap" 
+            depends="define-ant-contrib"
+            unless="${suite.name}.parameters.run.skipped">
+        <dirname property="bootstrapper.dir" file="${bootstrapper.location}"/>
+        <log message="Calling Custom Bootstrapper ${publisher.location} at ${publisher.dir} for ${suite.name}"/>
+        <ant dir="${bootstrapper.dir}" 
+             antfile="${bootstrapper.location}" 
+             target="bootstrap"
+             inheritAll="true"/>
+    </target>
+    
     <!-- Called from CC to launch the default ant publisher for test suite -->
     <target name="cc-publish" 
             depends="define-ant-contrib"

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=562326&r1=562325&r2=562326
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/scripts/cc-project.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/scripts/cc-project.xml Thu Aug  2 21:39:26 2007
@@ -164,6 +164,19 @@
                     ccfile="${@{suite.name}.parameters.cc.file.location}"
                 />
                 
+                <!-- insert custom bootstrapper -->
+                <if>
+                    <isset property="@{suite.name}.parameters.cc.bootstrapper"/>
+                <then>
+                    <insert-custom-bootstrapper
+                        suite="@{suite.name}"
+                        ccfile="${@{suite.name}.parameters.cc.file.location}"
+                        bootstrapper="${@{suite.name}.parameters.cc.bootstrapper}"
+                        antpropsfile="${tmp.ant-props-file}"
+                    />
+                </then>
+                </if>
+
                 <insert-modification-sets
                     suite="@{suite.name}"
                     ccfile="${@{suite.name}.parameters.cc.file.location}"
@@ -401,6 +414,33 @@
         </sequential>
     </macrodef>
 
+    <!-- insert custom bootstrapper -->
+    <macrodef name="insert-custom-bootstrapper">
+        <attribute name="suite"/>
+        <attribute name="ccfile"/>
+        <attribute name="bootstrapper"/>
+        <attribute name="antpropsfile"/>
+        <sequential>
+            <replace file="@{ccfile}">
+                <replacefilter 
+                    token="&lt;!-- @BT.BOOTSTRAPPER@ --&gt;"
+                    value="
+           &lt;antbootstrapper@NL@
+                anthome='${ant.home}'@NL@
+                timeout='${framework.parameters.cc.timeout}'@NL@
+                antWorkingDir='${root.dir}'@NL@
+                buildfile='${root.dir}/scripts/cc-exec-adaptor.xml'@NL@
+                target='cc-bootstrap'&gt;@NL@
+               &lt;property name='suite.name' value='@{suite}'/&gt;@NL@
+               &lt;property name='bootstrapper.location' value='@{bootstrapper}'/&gt;@NL@
+               &lt;property name='properties.dump.file'@NL@
+                         value='@{antpropsfile}'/&gt;@NL@
+           &lt;/antbootstrapper&gt;@NL@
+           &lt;!-- @BT.BOOTSTRAPPER@ --&gt;"/>
+            </replace>
+        </sequential>
+    </macrodef>
+
     <!-- insert modification sets defined for test suite 
          see: test-insert-modification-sets for unit test -->
     <macrodef name="insert-modification-sets">
@@ -470,7 +510,7 @@
             <replace file="@{ccfile}">
                 <replacefilter 
                     token="&lt;!-- @BT.MODIFICATIONSET@ --&gt;" 
-                    value="&lt;filesystem folder='@{triggerfile}'/&gt;@NL@
+                    value="&lt;filesystem folder='@{triggerfile}' username=''/&gt;@NL@
            &lt;!-- @BT.MODIFICATIONSET@ --&gt;"
                 />
             </replace>

Modified: harmony/enhanced/buildtest/branches/2.0/scripts/publisher.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/scripts/publisher.xml?view=diff&rev=562326&r1=562325&r2=562326
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/scripts/publisher.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/scripts/publisher.xml Thu Aug  2 21:39:26 2007
@@ -106,7 +106,7 @@
                   bcclist="${mail.bcc}"
                   subject="${mail.subject.line}"
                   files="${mail.attachs},${mail.execution.log}">
-                <message>${mail.summary.content}${mail.message.content}</message>
+                <message>${mail.summary.content}${line.separator}${mail.message.content}</message>
             </mail>
         </try>
         <catch>