harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From telli...@apache.org
Subject svn commit: r591474 - in /harmony/enhanced/buildtest/branches/2.0: adaptors/stress/adaptor.xml tests/stress/qa/build.xml tests/stress/qa/depends.properties
Date Fri, 02 Nov 2007 21:27:58 GMT
Author: tellison
Date: Fri Nov  2 14:27:57 2007
New Revision: 591474

URL: http://svn.apache.org/viewvc?rev=591474&view=rev
Log:
Apply patch HARMONY-5048 ([bti][stress-adaptor] stress test suite adaptor does not call correct
default stress build target)

Modified:
    harmony/enhanced/buildtest/branches/2.0/adaptors/stress/adaptor.xml
    harmony/enhanced/buildtest/branches/2.0/tests/stress/qa/build.xml
    harmony/enhanced/buildtest/branches/2.0/tests/stress/qa/depends.properties

Modified: harmony/enhanced/buildtest/branches/2.0/adaptors/stress/adaptor.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/adaptors/stress/adaptor.xml?rev=591474&r1=591473&r2=591474&view=diff
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/adaptors/stress/adaptor.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/adaptors/stress/adaptor.xml Fri Nov  2 14:27:57
2007
@@ -24,12 +24,9 @@
         <os family="windows"/>
     </condition>
 
-    <property name="junit.jar"      value="${ext.junit.location}"/>
     <property name="antcontrib.jar" value="${ext.ant-contrib.location}"/>
     <property name="cpptasks.jar"   value="${ext.cpptasks.location}/"/>
     <property name="jasmin.jar"     value="${ext.jasmin_1.1.location}/jasmin.jar"/>
-    <property name="th.jar"         value="${stress.depends.dir}/th.jar"/>
-    <property name="vmtt.jar"       value="${stress.depends.dir}/vmtt.jar"/>
 
     <property name="stress.root.dir" location="${test.sources.dir}/stress/qa"/>
     <property name="stress.make.dir" location="${stress.root.dir}"/>
@@ -44,8 +41,10 @@
         <svn-update-bt path="${test.sources.dir}/stress"/>
         <antcall target="setup-tools"/>
 
+        <call-stress target="get.punit"/>
+        <call-stress target="build.th"/>
+        <call-stress target="build.vmtt"/>
         <call-stress target="build.qa"/>
-        <!-- call-stress target="set.tasks,build.java,build.native"/ -->
 
         <mkdir dir="${stress.config.dir}"/>
         <copy todir="${stress.config.dir}">
@@ -78,12 +77,6 @@
 
     <target name="setup-tools">
         <svn-update-bt path="${test.sources.dir}/tools"/>
-        <ant dir="${test.sources.dir}/tools/harness"/>
-        <copy file="${test.sources.dir}/tools/th.dest/bin/th.jar"
-              todir="${stress.depends.dir}" failonerror="false" />
-        <ant dir="${test.sources.dir}/tools/vmtt"/>
-        <copy file="${test.sources.dir}/tools/vmtt.dest/bin/vmtt.jar"
-              todir="${stress.depends.dir}" failonerror="false"/>
     </target>
 
     <!-- do test execution -->
@@ -119,15 +112,13 @@
                <sysproperty key="harness.cfg" value="${stress.config.dir}/cfg_env.xml"
/>
                <sysproperty key="qa.exclude.list" value="${stress.config.dir}/exclude.file"
/>
                <sysproperty key="qa.bin" value="${stress.bin.dir}" />
-               <sysproperty key="junit.jar" value="${junit.jar}"/>
                <sysproperty key="antcontrib.jar" value="${antcontrib.jar}"/>
                <sysproperty key="cpptasks.jar" value="${cpptasks.jar}/"/>
                <sysproperty key="jasmin.jar" value="${jasmin.jar}"/>
-               <sysproperty key="th.jar" value="${th.jar}"/>
-               <sysproperty key="vmtt.jar" value="${vmtt.jar}"/>
             </exec-ant>
         </sequential>
     </macrodef>
 
 </project>
+
 

Modified: harmony/enhanced/buildtest/branches/2.0/tests/stress/qa/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/tests/stress/qa/build.xml?rev=591474&r1=591473&r2=591474&view=diff
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/tests/stress/qa/build.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/tests/stress/qa/build.xml Fri Nov  2 14:27:57
2007
@@ -85,7 +85,7 @@
 	-->
 	<property file="depends.properties"/>
 	
-	<target name="get.all" description="Downloading files">
+	<target name="get.all" description="Download" depends="get.punit">
 		
 		<mkdir dir="${cpptasks.dir}"/>
 		<download-one-file src="${cpptasks.url}" dest="${cpptasks.jar}"
@@ -101,14 +101,16 @@
 		<unzip src="${jasmin.zip}" dest="${jasmin.dir}" overwrite="false">
 			<patternset includes="${jasmin.extract.pattern}"/>
 		</unzip>
-		
+	</target>
+	
+	<target name="get.punit" description="P-unit checkout and build">
 		<mkdir dir="${punit.repository}"/>
 		<exec executable="svn" dir="${punit.repository}" failonerror="true">
 			<arg value="checkout"/>
 			<arg value="${punit.url}"/>
 		</exec>
 		<ant dir="${punit.dir}"/>
-		<ant dir="${punit.extension.dir}"/>
+		<ant dir="${punit.ext.dir}"/>
 	</target>
 	
 	<macrodef name="download-one-file">
@@ -172,7 +174,7 @@
 				<pathelement location="${th.jar}"/>
 				<pathelement location="${junit.jar}"/>
 				<pathelement location="${punit.jar}"/>
-				<pathelement location="${punit.ext.jars}"/>
+				<pathelement path="${punit.ext.jars}"/>
 			</classpath>
 			<arg value="-cfp"/>
 			<arg value="${harness.cfg}"/>
@@ -251,6 +253,7 @@
 				<pathelement location="${th.jar}"/>
 				<pathelement location="${junit.jar}"/>
 				<pathelement location="${punit.jar}"/>
+                                <pathelement path="${punit.ext.jars}"/>
 			</classpath>
 		</javac>
 	</target>
@@ -340,4 +343,5 @@
 	</target>
 	
 </project>
+
 

Modified: harmony/enhanced/buildtest/branches/2.0/tests/stress/qa/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/tests/stress/qa/depends.properties?rev=591474&r1=591473&r2=591474&view=diff
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/tests/stress/qa/depends.properties (original)
+++ harmony/enhanced/buildtest/branches/2.0/tests/stress/qa/depends.properties Fri Nov  2
14:27:57 2007
@@ -39,8 +39,8 @@
 punit.version=0.12
 punit.url=http://p-unit.svn.sourceforge.net/svnroot/p-unit/trunk
 punit.dir=${punit.repository}/trunk/punit
-punit.extension.dir=${punit.repository}/trunk/punit.extension
-punit.libdir=${punit.extension.dir}/lib
+punit.ext.dir=${punit.repository}/trunk/punit.extension
+punit.libdir=${punit.ext.dir}/lib
 junit.jar=${punit.libdir}/junit-4.3.1.jar
 punit.jar=${punit.dir}/p-unit-${punit.version}.jar
-punit.extension.jars=${punit.extension.dir}/p-unit-extension-${punit.version}.jar;${punit.libdir}/itext-2.0.2.jar;${punit.libdir}/jcommon-1.0.9.jar;${punit.libdir}/jfreechart-1.0.5.jar
+punit.ext.jars=${punit.ext.dir}/p-unit-extension-${punit.version}.jar;${punit.libdir}/itext-2.0.2.jar;${punit.libdir}/jcommon-1.0.9.jar;${punit.libdir}/jfreechart-1.0.5.jar



Mime
View raw message