harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From var...@apache.org
Subject svn commit: r582150 - in /harmony/enhanced/buildtest/branches/2.0: adaptors/hdk/adaptor.xml adaptors/hdk/parameters.xml scripts/cc-exec-adaptor.xml scripts/cc-project.xml scripts/parameters.xml scripts/templates/cc-project-template.xml
Date Fri, 05 Oct 2007 09:09:26 GMT
Author: varlax
Date: Fri Oct  5 02:09:25 2007
New Revision: 582150

URL: http://svn.apache.org/viewvc?rev=582150&view=rev
Log:
Fixed HARMONY-4883 [bti] BTI polls SVN repository too eagerly

Modified:
    harmony/enhanced/buildtest/branches/2.0/adaptors/hdk/adaptor.xml
    harmony/enhanced/buildtest/branches/2.0/adaptors/hdk/parameters.xml
    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/parameters.xml
    harmony/enhanced/buildtest/branches/2.0/scripts/templates/cc-project-template.xml

Modified: harmony/enhanced/buildtest/branches/2.0/adaptors/hdk/adaptor.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/adaptors/hdk/adaptor.xml?rev=582150&r1=582149&r2=582150&view=diff
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/adaptors/hdk/adaptor.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/adaptors/hdk/adaptor.xml Fri Oct  5 02:09:25 2007
@@ -24,14 +24,27 @@
               value="${temp.files.dir}/cc-hdk-project.xml"/>
 
     <!-- do setup of the HDK workspace -->
-    <target name="setup">
+    <target name="setup" depends="-check-setup,-do-setup"/>
+    <target name="-check-setup">
+        <condition property="need.setup">
+            <not><available file="${hdk.trunk.dir}"/></not>
+        </condition>
+    </target>
+    <target name="-do-setup" if="need.setup">
         <mkdir dir="${hdk.trunk.dir}"/>
-
         <echo message="Checkout HDK trunk into ${hdk.trunk.dir}"/>
         <svn-co url="${svn.url}" trunk="${hdk.trunk.dir}"/>
     </target>
 
     <target name="run">
+        <!-- update SVN non-recursively, HDK build will do the rest -->
+        <!-- "svnrevision" is supplied by CC normally -->
+        <property name="svnrevision" value="HEAD"/>
+        <log message="Updating HDK workspace to revision: ${svnrevision}"/>
+        <exec executable="svn" dir="${hdk.trunk.dir}" failonerror="true">
+            <arg line="update -r ${svnrevision} -N"/>
+        </exec>
+        
         <exec-ant dir="${hdk.trunk.dir}">
             <jvmarg line="-Xmx1000M"/>
             <sysproperty key="keep.working" value="true"/>

Modified: harmony/enhanced/buildtest/branches/2.0/adaptors/hdk/parameters.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/adaptors/hdk/parameters.xml?rev=582150&r1=582149&r2=582150&view=diff
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/adaptors/hdk/parameters.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/adaptors/hdk/parameters.xml Fri Oct  5 02:09:25
2007
@@ -19,7 +19,7 @@
 
     <!-- shared values -->
     <shared>
-        <svn.url value="https://svn.apache.org/repos/asf/harmony/enhanced/trunk"/>
+        <svn.url value="http://svn.apache.org/repos/asf/harmony/enhanced/trunk"/>
         <trunk.dir location="${checkouts.dir}/hdk" id="trunk.dir.id"/>
         <classlib.trunk.dir location="${checkouts.dir}/hdk/working_classlib" 
                             id="classlib.trunk.dir.id"/>
@@ -37,5 +37,6 @@
         <usesvn.classlib refid="classlib.trunk.dir.id"/>
         <usesvn.drlvm refid="drlvm.trunk.dir.id"/>
         <usesvn.jdktools refid="jdktools.trunk.dir.id"/>
+        <skip.svnupdate value="true"/>
     </cc>
 </parameters>

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?rev=582150&r1=582149&r2=582150&view=diff
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/scripts/cc-exec-adaptor.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/scripts/cc-exec-adaptor.xml Fri Oct  5 02:09:25
2007
@@ -76,6 +76,7 @@
         <record name="${cc.execution.log.file}" append="yes" action="start"/>
         <trycatch property="exception" reference="execution.exception.ref">
         <try>
+            <runtarget target="update-svn"/>
             <ant dir="${root.dir}/adaptors/${suite.name}" 
                  antfile="adaptor.xml" 
                  target="run"
@@ -102,6 +103,17 @@
               message="&lt;/body>&lt;/html>"/>
         <fail message="${exception}" if="exception"/>
     </target>
+    
+    <target name="update-svn" if="${suite.name}.parameters.cc.usesvn" 
+        unless="${suite.name}.parameters.cc.skip.svnupdate">
+        <!-- "svnrevision" property is set by CC since v2.7.1 -->
+        <property name="svnrevision" value="HEAD"/>
+        <propertycopy property="ws" from="${suite.name}.parameters.cc.usesvn"/>
+        <svn-cleanup trunk="${ws}"/>
+        <exec executable="svn" dir="${ws}" failonerror="true">
+            <arg line="update -r ${svnrevision}"/>
+        </exec>
+    </target>
 
     <!-- Called from CC to launch the custom ant publisher for test suite -->
     <!-- Does nothing if the execution has been skipped (due to failures
@@ -255,8 +267,7 @@
         <copy file="${cc.execution.log.file}" todir="${status.report.dir}"/>
             
         <condition property="build.status" value="passed" else="failed">
-            <!-- the property is passed by CC -->
-            <equals arg1="${thisbuildsuccessful}" arg2="true" />
+            <istrue value="${thisbuildsuccessful}"/>
         </condition>
         <echo file="${status.report.dir}/status.txt" message="status=${build.status}${line.separator}timestamp=${builddate}"
/>
 

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?rev=582150&r1=582149&r2=582150&view=diff
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/scripts/cc-project.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/scripts/cc-project.xml Fri Oct  5 02:09:25 2007
@@ -332,27 +332,6 @@
             <for list="${@{suite}.parameters.depends}" param="dependency">
             <sequential>
                 <if>
-                    <isset property="@{dependency}.parameters.cc.usesvn"/>
-                <then>
-                    <!-- veto on execution before superior with svn 
-                         modifications -->
-                    <replace file="@{ccfile}">
-                        <replacefilter 
-                            token="&lt;!-- @BT.VETO@ --&gt;" 
-                            value="&lt;!-- veto on execution before superior with svn
modifications --&gt;@NL@
-           &lt;veto&gt;@NL@
-               &lt;triggers&gt;@NL@&lt;!-- @BT.USESVN@ -->@NL@
-               &lt;/triggers&gt;@NL@
-               &lt;buildstatus logdir='${cc.log.dir}/@{dependency}'/&gt;@NL@
-           &lt;/veto&gt;@NL@
-           &lt;!-- @BT.VETO@ --&gt;"
-                        />
-                    </replace>
-                    <insert-usesvn suite="@{dependency}" ccfile="@{ccfile}" 
-                                   indent="                    "/>
-                </then>
-                </if>
-                <if>
                     <isset property="framework.parameters.schedule.time"/>
                 <then>
                     <!-- veto on scheduled execution before superior one -->
@@ -460,19 +439,6 @@
                 />
             </replace>
             <if>
-                <isset property="@{suite}.parameters.cc.usesvn"/>
-            <then>
-                <replace file="@{ccfile}">
-                    <replacefilter 
-                        token="&lt;!-- @BT.BOOTSTRAPPER@ --&gt;" 
-                        value="&lt;!-- @BT.USESVN@ -->"
-                    />
-                </replace>
-                <insert-usesvn suite="@{suite}" ccfile="@{ccfile}" 
-                               task="svnbootstrapper" indent="            "/>
-            </then>
-            </if>
-            <if>
                 <and>
                     <isset property="@{suite}.parameters.cc.trigger"/>
                     <!-- no need in triggers in scheduled execution mode -->
@@ -561,8 +527,10 @@
                 <for list="${@{suite}.parameters.depends}" param="dependency">
                 <sequential>
                     <if>
-                        <not><contains string="@{visited}" 
-                                       substring=",@{dependency},"/></not>
+                        <and>
+                            <istrue value="${framework.parameters.cc.get-mods-tree}"/>
+                            <not><contains string="@{visited}" substring=",@{dependency},"/></not>
+                        </and>
                     <then>
                         <build-modification-tree
                             suite="@{dependency}"

Modified: harmony/enhanced/buildtest/branches/2.0/scripts/parameters.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/scripts/parameters.xml?rev=582150&r1=582149&r2=582150&view=diff
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/scripts/parameters.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/scripts/parameters.xml Fri Oct  5 02:09:25 2007
@@ -20,10 +20,10 @@
             value="8000" 
             description="The port for CC's JMX console."/>
         <quietperiod 
-            value="30" 
+            value="0" 
             description="The number of seconds since last SVN modification to wait before
Test Suites execution."/>
         <interval 
-            value="300" 
+            value="1800" 
             description="Interval period in seconds to check for necessity of Test Suite
Execution."/>
         <doclean 
             value="false" 
@@ -34,6 +34,9 @@
         <buildafterfailed
             value="false"
             description="Do recurring execution after failure?"/>
+        <get-mods-tree
+            value="false"
+            description="Obtain SVN modifications from super-suite(s). Produces nicer reports
but increases strain on SVN server."/>
     </cc>
 
     <schedule>

Modified: harmony/enhanced/buildtest/branches/2.0/scripts/templates/cc-project-template.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/scripts/templates/cc-project-template.xml?rev=582150&r1=582149&r2=582150&view=diff
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/scripts/templates/cc-project-template.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/scripts/templates/cc-project-template.xml Fri
Oct  5 02:09:25 2007
@@ -9,7 +9,10 @@
     <project name="@BT.PROJECT@" 
              buildafterfailed="${framework.parameters.cc.buildafterfailed}" 
              requireModification="@BT.REQMODS@">
+
+        <!-- Use ISO 8601 format for timestamps, to ease results parsing -->
         <dateformat format="yyyy-MM-dd HH:mm:ss Z"/>
+
         <listeners>
             <!-- Resolved to <currentbuildstatuslistener file="${logs.dir}/...">
                  Should be here if there are any suites depending
@@ -18,16 +21,13 @@
         </listeners>
 
         <bootstrappers>
-            <!-- Resolved to 
-                    <svnbootstrapper> 
-                 if we use SVN for sources, i.e. 
-                    ${suite.name}.parameters.cc.usesvn="${sources.location}"
-                 is set -->
-<!-- @BT.BOOTSTRAPPER@ -->
+            <!-- Keep it if you want to use custom ant bootstrappers
+                 specified for test suite by cc.bootstrapper parameter -->
+            <!-- @BT.BOOTSTRAPPER@ -->
         </bootstrappers>
 
         <modificationset quietperiod="${framework.parameters.cc.quietperiod}">
-            <!-- veto tag MUST be present as it controls the test suite 
+            <!-- veto tag may be present to help control the test suite 
                  execution order -->
             <!-- @BT.VETO@ -->
             <!-- tag is resolved to modification sets defined for test suite:
@@ -44,7 +44,7 @@
                 - in any case it is additionally resolved to
                     <forceonly/>
             -->
-<!-- @BT.MODIFICATIONSET@ -->
+            <!-- @BT.MODIFICATIONSET@ -->
         </modificationset>
 
         <schedule interval="${framework.parameters.cc.interval}">



Mime
View raw message