harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smish...@apache.org
Subject svn commit: r616791 - in /harmony/enhanced/buildtest/branches/2.0: adaptors/tptp/adaptor.xml tests/tptp/build.xml
Date Wed, 30 Jan 2008 15:45:03 GMT
Author: smishura
Date: Wed Jan 30 07:45:02 2008
New Revision: 616791

URL: http://svn.apache.org/viewvc?rev=616791&view=rev
Log:
TPTP suite: move compiling support classes from adaptor to suite's build.xml

Modified:
    harmony/enhanced/buildtest/branches/2.0/adaptors/tptp/adaptor.xml
    harmony/enhanced/buildtest/branches/2.0/tests/tptp/build.xml

Modified: harmony/enhanced/buildtest/branches/2.0/adaptors/tptp/adaptor.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/adaptors/tptp/adaptor.xml?rev=616791&r1=616790&r2=616791&view=diff
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/adaptors/tptp/adaptor.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/adaptors/tptp/adaptor.xml Wed Jan 30 07:45:02
2008
@@ -58,11 +58,6 @@
         <copy todir="${work.dir}" file="${tests.dir}/report.xsl"/>
         <copy todir="${work.dir}" file="${tests.dir}/test.xsl"/>
 
-        <!-- Compile sources -->
-        <javac srcdir="${work.dir}"
-               destdir="${work.dir}"
-               includes="*.java"/>
-
         <!-- Copy exclude list file for updating suite's config -->
         <copy todir="${tptp.results}" file="${tests.dir}/${tptp.parameters.optional.exclude.list}"/>
 

Modified: harmony/enhanced/buildtest/branches/2.0/tests/tptp/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/tests/tptp/build.xml?rev=616791&r1=616790&r2=616791&view=diff
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/tests/tptp/build.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/tests/tptp/build.xml Wed Jan 30 07:45:02 2008
@@ -66,11 +66,13 @@
     <echo message="CLASSPATH: ${classpath_jar}"/>
     <echo message="BOOTCLASSPATH: ${bootclasspath_jar}"/>
 
+    <property name="classes" location="${basedir}/classes" />
+    
     <!-- All arguments -->
     <property name="jvm.args" value="${tptp.options} -Dtest.param='${tested.vm.options}'
-Dtest.timeout=${test.timeout} -Dconfigfile=${config.file.new} -Dtest.output=${report.dir}
-Dtest.java=${tested.runtime} -Dtest.home=${test.home} -Dac.home=${ac.home} -Dtest.verbose=false
-Xbootclasspath/p:${bootclasspath_jar} "/> 
       
     <!-- Tests running -->     
-    <target name="run"> 
+    <target name="run" depends="compile"> 
         <!-- Clear previous results -->
         <delete dir="${report.dir}" failonerror="false"/>
         <mkdir dir="${report.dir}"/>
@@ -82,7 +84,7 @@
         <echo message="=====Running class: ${tptp.test.class}"/>  
 
         <java classname="updateExclude"
-              classpath="."
+              classpath="${classes}"
               fork="yes"
               failonerror="true">
             <arg value="${config.file}"/>
@@ -118,7 +120,7 @@
         
         <!-- Migrate txt results file to xml -->
         <java classname="updateResults"
-              classpath="."
+              classpath="${classes}"
               fork="yes"
               failonerror="true">
             <arg value="${report.dir}/AllTests.txt"/>
@@ -127,7 +129,7 @@
         
         <!-- Prepere summary report -->       
         <java classname="testsCount"
-              classpath="."
+              classpath="${classes}"
               fork="yes"
               resultproperty="test.res.code">
             <arg value="${report.dir}"/>
@@ -154,4 +156,8 @@
 
     </target>   
 
+    <target name="compile">
+        <mkdir dir="${classes}" />
+        <javac srcdir="${basedir}" destdir="${classes}" includes="*.java" />
+    </target>
 </project>



Mime
View raw message