harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smish...@apache.org
Subject svn commit: r566934 - /harmony/enhanced/buildtest/branches/2.0/adaptors/classlib-test/adaptor.xml
Date Fri, 17 Aug 2007 06:13:43 GMT
Author: smishura
Date: Thu Aug 16 23:13:42 2007
New Revision: 566934

URL: http://svn.apache.org/viewvc?view=rev&rev=566934
Log:
Optimize classlib workspace setup: perform checkout and build under CC and only if required

Modified:
    harmony/enhanced/buildtest/branches/2.0/adaptors/classlib-test/adaptor.xml

Modified: harmony/enhanced/buildtest/branches/2.0/adaptors/classlib-test/adaptor.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/adaptors/classlib-test/adaptor.xml?view=diff&rev=566934&r1=566933&r2=566934
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/adaptors/classlib-test/adaptor.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/adaptors/classlib-test/adaptor.xml Thu Aug 16
23:13:42 2007
@@ -23,35 +23,16 @@
     <property name="classlib-test.results.dir"
               value="${results.dir}/${suite.name}"/>
 
-    <!-- if the suite is run against snapshot -->
-    <condition property="is.snapshot">
-        <equals arg1="${classlib-test.parameters.depends}"
-                arg2="snapshot"
-                trim="yes" />
-    </condition>
-
     <!-- the default value for JRE options -->
     <property name="jre.options" value="-showversion"/>
 
     <!-- do setup -->
-    <target name="setup" depends="-setup-classlib-ws">
+    <target name="setup">
         <mkdir dir="${classlib-test.results.dir}"/>
     </target>
 
-    <target name="-setup-classlib-ws" if="is.snapshot">
-        <mkdir dir="${classlib-test.parameters.required.trunk.dir}" />
-        <svn-co url="${classlib-test.parameters.required.trunk.url}"
-                trunk="${classlib-test.parameters.required.trunk.dir}" />
-
-        <ant target="fetch-depends"
-             dir="${classlib-test.parameters.required.trunk.dir}"
-             inheritAll="false" />
-        <ant dir="${classlib-test.parameters.required.trunk.dir}"
-             inheritAll="false" />
-    </target>
-
     <!-- do run -->
-    <target name="run" depends="-update-classlib-ws">
+    <target name="run" depends="-setup-classlib-ws,-update-classlib-ws">
         <!-- remove old results (they have been archived after the run) -->
         <delete quiet="true" verbose="false">
             <fileset dir="${classlib-test.results.dir}" includes="**/*"/>
@@ -99,11 +80,44 @@
               if="classlib-test.run.failed"/>
     </target>
 
-    <target name="-update-classlib-ws" if="is.snapshot">
-        <!-- adjust classlib-tests to snapshots revision -->
-        <loadproperties srcFile="${snapshot.svn.revision.file}"/>
-        <exec executable="svn" dir="${classlib-test.trunk.dir}" failonerror="true">
-            <arg line="-r${svn.revision}"/>
+    <!--                                                    -->
+    <!-- Targets and properties related to snapshot testing -->
+    <!--                                                    -->
+    <condition property="is.snapshot">
+        <equals arg1="${classlib-test.parameters.depends}"
+                arg2="snapshot"
+                trim="yes" />
+    </condition>
+
+    <condition property="is.checkout_ws">
+        <and>
+            <isset property="is.snapshot" />
+            <not>
+                <available file="${classlib-test.trunk.dir}/build.xml" />
+            </not>
+        </and>
+    </condition>
+
+    <target name="-setup-classlib-ws" if="is.checkout_ws">
+        <mkdir dir="${classlib-test.parameters.required.trunk.dir}" />
+        <svn-co url="${classlib-test.parameters.required.trunk.url}"
+                trunk="${classlib-test.parameters.required.trunk.dir}" />
+
+        <ant target="fetch-depends"
+             dir="${classlib-test.parameters.required.trunk.dir}"
+             inheritAll="false" />
+        <ant dir="${classlib-test.parameters.required.trunk.dir}"
+             inheritAll="false" />
+    </target>
+
+    <target name="-update-classlib-ws"
+            if="is.snapshot"
+            description="adjusts classlib-tests to snapshots revision">
+        <loadproperties srcFile="${snapshot.svn.revision.file}" />
+        <exec executable="svn"
+              dir="${classlib-test.trunk.dir}"
+              failonerror="true">
+            <arg line="-r${svn.revision}" />
             <arg line="update" />
         </exec>
     </target>



Mime
View raw message