svn commit: r566489 - in /harmony/enhanced/buildtest/branches/2.0/adaptors: classlib-test/adaptor.xml snapshot/adaptor.xml snapshot/framework.local.properties

[sm...@apache.org]

Author: smishura
Date: Wed Aug 15 22:10:13 2007
New Revision: 566489

URL: http://svn.apache.org/viewvc?view=rev&rev=566489
Log:
Add classlib-test suite to snapshot testing

Modified:
    harmony/enhanced/buildtest/branches/2.0/adaptors/classlib-test/adaptor.xml
    harmony/enhanced/buildtest/branches/2.0/adaptors/snapshot/adaptor.xml
    harmony/enhanced/buildtest/branches/2.0/adaptors/snapshot/framework.local.properties

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=566489&r1=566488&r2=566489
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/adaptors/classlib-test/adaptor.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/adaptors/classlib-test/adaptor.xml Wed Aug 15 22:10:13 2007
@@ -23,14 +23,33 @@
     <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">
+    <target name="setup" depends="-setup-classlib-ws">
         <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">
         <!-- remove old results (they have been archived after the run) -->
@@ -78,6 +97,15 @@
 
         <fail message="There were CLASSLIB Unit Test failures."
               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}"/>
+            <arg line="update" />
+        </exec>
     </target>
 
 </project>

Modified: harmony/enhanced/buildtest/branches/2.0/adaptors/snapshot/adaptor.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/adaptors/snapshot/adaptor.xml?view=diff&rev=566489&r1=566488&r2=566489
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/adaptors/snapshot/adaptor.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/adaptors/snapshot/adaptor.xml Wed Aug 15 22:10:13 2007
@@ -177,6 +177,16 @@
         <archive-result/>
     </target>
 
+    <target name="publish-classlib-test">
+        <mkdir dir="${snapshot.results.dir}/classlib-test" />
+        <copy todir="${snapshot.results.dir}/classlib-test">
+            <fileset dir="${checkouts.dir}/classlib/build/test_report/html">
+                <include name="**" />
+            </fileset>
+        </copy>
+        <archive-result/>
+    </target>
+
     <target name="publish-func">
         <delete dir="${snapshot.results.dir}/func" />
         <mkdir dir="${snapshot.results.dir}/func" />

Modified: harmony/enhanced/buildtest/branches/2.0/adaptors/snapshot/framework.local.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/adaptors/snapshot/framework.local.properties?view=diff&rev=566489&r1=566488&r2=566489
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/adaptors/snapshot/framework.local.properties (original)
+++ harmony/enhanced/buildtest/branches/2.0/adaptors/snapshot/framework.local.properties Wed Aug 15 22:10:13 2007
@@ -9,6 +9,15 @@
 axis2_app.parameters.cc.config=${adaptors.dir}/snapshot/suite-cc-custom-config.xml
 
 #
+classlib-test.parameters.depends=snapshot
+classlib-test.parameters.required.tested.jre=${snapshot.parameters.shared.jre}
+classlib-test.parameters.cc.config=${adaptors.dir}/snapshot/suite-cc-custom-config.xml
+
+classlib-test.parameters.required.trunk.url=http://svn.apache.org/repos/asf/harmony/enhanced/classlib/trunk
+classlib-test.trunk.dir=${checkouts.dir}/classlib
+classlib-test.parameters.required.trunk.dir=${classlib-test.trunk.dir}
+
+#
 dacapo.parameters.depends=snapshot
 dacapo.parameters.required.jdk.to.test.home=${snapshot.parameters.shared.jre}
 dacapo.parameters.cc.config=${adaptors.dir}/snapshot/suite-cc-custom-config.xml