harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smish...@apache.org
Subject svn commit: r647071 - /harmony/enhanced/buildtest/trunk/infra/scripts/cc-project.xml
Date Fri, 11 Apr 2008 07:29:54 GMT
Author: smishura
Date: Fri Apr 11 00:29:38 2008
New Revision: 647071

URL: http://svn.apache.org/viewvc?rev=647071&view=rev
Log:
Add workaround for ANT 1.7 XmlProperty task sets empty value
in case of xml file like:

<parameters>
  <schedule>
    <time description="description"/>
  </schedule>
</parameters>

And ANT 1.6.5 doesn't set 'parameters.schedule.time' property

Modified:
    harmony/enhanced/buildtest/trunk/infra/scripts/cc-project.xml

Modified: harmony/enhanced/buildtest/trunk/infra/scripts/cc-project.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/trunk/infra/scripts/cc-project.xml?rev=647071&r1=647070&r2=647071&view=diff
==============================================================================
--- harmony/enhanced/buildtest/trunk/infra/scripts/cc-project.xml (original)
+++ harmony/enhanced/buildtest/trunk/infra/scripts/cc-project.xml Fri Apr 11 00:29:38 2008
@@ -25,6 +25,25 @@
         <basename file="${basedir}" property="suite.name" />
         <property file="${config.dir}/${suite.name}.properties" />
 
+        <condition property="is.schedule.time">
+            <!-- workaround: ANT 1.7 XmlProperty task sets empty value -->
+            <and>
+                <isset property="framework.parameters.schedule.time" />
+                <length string="${framework.parameters.schedule.time}"
+                        when="greater"
+                        length="0" />
+            </and>
+        </condition>
+        <condition property="is.schedule.day">
+            <!-- workaround: ANT 1.7 XmlProperty task sets empty value -->
+            <and>
+                <isset property="framework.parameters.schedule.day" />
+                <length string="${framework.parameters.schedule.day}"
+                        when="greater"
+                        length="0" />
+            </and>
+        </condition>
+
         <create-cc-configuration suite.name="${suite.name}" />
     </target>
     
@@ -69,7 +88,7 @@
                            value="false"
                            else="true">
                     <and>
-                        <isset property="framework.parameters.schedule.time"/>
+                        <isset property="is.schedule.time"/>
                         <isset property="@{suite.name}.independent"/>
                     </and>
                 </condition>
@@ -86,7 +105,7 @@
                         value="time='${framework.parameters.schedule.time}' "
                         else="">
                     <and>
-                        <isset property="framework.parameters.schedule.time"/>
+                        <isset property="is.schedule.time"/>
                         <isset property="@{suite.name}.independent"/>
                     </and>
                 </condition>
@@ -95,7 +114,7 @@
                         value="day='${framework.parameters.schedule.day}' "
                         else="">
                     <and>
-                        <isset property="framework.parameters.schedule.day"/>
+                        <isset property="is.schedule.day"/>
                         <isset property="@{suite.name}.independent"/>
                     </and>
                 </condition>
@@ -227,7 +246,7 @@
             <for list="${@{suite}.parameters.depends}" param="dependency">
             <sequential>
                 <if>
-                    <isset property="framework.parameters.schedule.time"/>
+                    <isset property="is.schedule.time"/>
                 <then>
                     <!-- veto on scheduled execution before superior one -->
                     <replace file="@{ccfile}">
@@ -336,7 +355,7 @@
                 <and>
                     <isset property="@{suite}.parameters.cc.trigger"/>
                     <!-- no need in triggers in scheduled execution mode -->
-                    <not><isset property="framework.parameters.schedule.time"/></not>
+                    <not><isset property="is.schedule.time"/></not>
                 </and>
             <then>
                 <insert-trigger



Mime
View raw message