From: <pet...@us...> - 2007-01-19 01:59:13
|
Revision: 11316 http://svn.sourceforge.net/jikesrvm/?rev=11316&view=rev Author: peter_donald Date: 2007-01-18 17:59:11 -0800 (Thu, 18 Jan 2007) Log Message: ----------- * Continue to work on the testing infrastructure and build system to reduce duplication. * The testing infrastructure should now work for any target rather than just ia32_linux (untested) * The testing infrastructure now saves the aggregated results of a run in results/${tests.name}-${timestamp}.xml.gz * Add in preliminary test file for jgf-threads benchmark Modified Paths: -------------- rvmroot/trunk/build/components.xml rvmroot/trunk/build/properties.xml rvmroot/trunk/build/tests.xml rvmroot/trunk/build.xml rvmroot/trunk/testing/build.xml rvmroot/trunk/testing/tests/CaffeineMark/build.xml rvmroot/trunk/testing/tests/basic/build.xml rvmroot/trunk/testing/tests/dacapo/build.xml rvmroot/trunk/testing/tests/gctest/build.xml rvmroot/trunk/testing/tests/jBYTEmark/build.xml rvmroot/trunk/testing/tests/javalex/build.xml rvmroot/trunk/testing/tests/jgf/build.xml rvmroot/trunk/testing/tests/jni/build.xml rvmroot/trunk/testing/tests/opttests/build.xml rvmroot/trunk/testing/tests/soot/build.xml rvmroot/trunk/testing/tests/xerces/build.xml Added Paths: ----------- rvmroot/trunk/build/base.xml rvmroot/trunk/build/tasks.xml rvmroot/trunk/testing/tests/base-test-build.xml rvmroot/trunk/testing/tests/jgf-threads/build.xml Property Changed: ---------------- rvmroot/trunk/ Property changes on: rvmroot/trunk ___________________________________________________________________ Name: svn:ignore - generated dist target components .ant.properties + results generated dist target components .ant.properties Added: rvmroot/trunk/build/base.xml =================================================================== --- rvmroot/trunk/build/base.xml (rev 0) +++ rvmroot/trunk/build/base.xml 2007-01-19 01:59:11 UTC (rev 11316) @@ -0,0 +1,96 @@ +<!-- +common build component for setting up and checking propertys that common across all builds - even nightly builds. + jikesrvm.dir MUST be set to base directory before importing project. +--> +<project name="base"> + + <property file="${jikesrvm.dir}/.ant.properties"/> + + <!-- location of components --> + <property name="components.dir" location="${jikesrvm.dir}/components"/> + + <!-- location of intermediate directory --> + <property name="build.dir" location="${jikesrvm.dir}/target"/> + + <!-- location for image directory --> + <property name="dist.dir" location="${jikesrvm.dir}/dist"/> + + <!-- by default not working on patch --> + <property name="patch.name" value=""/> + + <!-- **************************************************************************** --> + <!-- * * --> + <!-- * Property initialization section of the build * --> + <!-- * * --> + <!-- **************************************************************************** --> + + <!-- recursive property expansion macro --> + <macrodef name="propertycopy"> + <attribute name="name"/> + <attribute name="from"/> + <sequential> + <property name="@{name}" value="${@{from}}"/> + </sequential> + </macrodef> + + <!-- Macro to test target property is set --> + <macrodef name="test-property"> + <attribute name="name"/> + <attribute name="location"/> + <sequential> + <fail unless="@{name}"> + @{name} property not specified. Please specify property in @{location}. + </fail> + </sequential> + </macrodef> + + <!-- Macro to test property set to name of executable --> + <macrodef name="test-file"> + <attribute name="name"/> + <attribute name="location"/> + <attribute name="msg" default=""/> + <sequential> + <test-property name="@{name}" location="@{location}"/> + <condition property="@{name}_invalid" value="1"> + <not> + <available file="${@{name}}"/> + </not> + </condition> + <fail if="@{name}_invalid"> + Value of @{name} property is invalid. (${@{name}}). + @{msg} + </fail> + </sequential> + </macrodef> + + <target name="check-host-name"> + <fail unless="host.name"> + host.name property not specified. Please specify property on commandline or in ${jikesrvm.dir}/.ant.properties. + </fail> + </target> + + <target name="check-target-name"> + <fail unless="target.name"> + target.name property not specified. Please specify property on commandline or in ${jikesrvm.dir}/.ant.properties. + </fail> + </target> + + <!-- **************************************************************************** --> + <!-- * * --> + <!-- * Check host and target are identical when building native components * --> + <!-- * * --> + <!-- **************************************************************************** --> + + <macrodef name="check-host-and-target-match"> + <attribute name="message"/> + <sequential> + <condition property="host_and_target_same" value="true"> + <equals arg1="${host.name}" arg2="${target.name}"/> + </condition> + <fail unless="host_and_target_same"> + Host and target are not the same and thus @{message} + </fail> + </sequential> + </macrodef> + +</project> \ No newline at end of file Property changes on: rvmroot/trunk/build/base.xml ___________________________________________________________________ Name: svn:mime-type + text/xml Name: svn:eol-style + native Modified: rvmroot/trunk/build/components.xml =================================================================== --- rvmroot/trunk/build/components.xml 2007-01-18 14:09:35 UTC (rev 11315) +++ rvmroot/trunk/build/components.xml 2007-01-19 01:59:11 UTC (rev 11316) @@ -4,9 +4,6 @@ --> <project name="components"> - <!-- location of components --> - <property name="components.dir" location="${jikesrvm.dir}/components"/> - <!-- **************************************************************************** --> <!-- * * --> <!-- * Downloading and installing Classpath component * --> Modified: rvmroot/trunk/build/properties.xml =================================================================== --- rvmroot/trunk/build/properties.xml 2007-01-18 14:09:35 UTC (rev 11315) +++ rvmroot/trunk/build/properties.xml 2007-01-19 01:59:11 UTC (rev 11316) @@ -4,8 +4,6 @@ --> <project name="propertys"> - <property file="${jikesrvm.dir}/.ant.properties"/> - <property name="config.file" location="${jikesrvm.dir}/build/configs/${config.name}.properties"/> <property name="target.file" location="${jikesrvm.dir}/build/targets/${target.name}.properties"/> <property name="components.file" location="${jikesrvm.dir}/build/components.properties"/> @@ -26,9 +24,6 @@ <property name="gcspy.version" value="1_01"/> <property name="jai.version" value="1_1_2_01"/> - <!-- by default not working on patch --> - <property name="patch.name" value=""/> - <condition property="build.name" value="${config.name}_${target.name}" else="${config.name}_${target.name}_${patch.name}"> <equals arg1="${patch.name}" arg2=""/> </condition> @@ -39,26 +34,6 @@ <!-- * * --> <!-- **************************************************************************** --> - <!-- recursive property expansion macro --> - <macrodef name="propertycopy"> - <attribute name="name"/> - <attribute name="from"/> - <sequential> - <property name="@{name}" value="${@{from}}"/> - </sequential> - </macrodef> - - <!-- Macro to test target property is set --> - <macrodef name="test-property"> - <attribute name="name"/> - <attribute name="location"/> - <sequential> - <fail unless="@{name}"> - @{name} property not specified. Please specify property in @{location}. - </fail> - </sequential> - </macrodef> - <target name="check-config-properties"> <fail unless="config.name"> config.name property not specified. Please specify property on commandline or in ${jikesrvm.dir}/.ant.properties. @@ -73,10 +48,7 @@ </condition> </target> - <target name="check-target-properties"> - <fail unless="target.name"> - target.name property not specified. Please specify property on commandline or in ${jikesrvm.dir}/.ant.properties. - </fail> + <target name="check-target-properties" depends="check-target-name"> <available property="target_config_present" file="${target.file}"/> <fail unless="target_config_present"> Target file ${target.file} not present. Please set target.name to the name of file in ${jikesrvm.dir}/build/targets directory without the .properties suffix. @@ -92,29 +64,7 @@ <test-property name="target.dll-ext" location="${target.file}"/> </target> - <!-- Macro to test property set to name of executable --> - <macrodef name="test-file"> - <attribute name="name"/> - <attribute name="location"/> - <attribute name="msg" default=""/> - <sequential> - <test-property name="@{name}" location="@{location}"/> - <condition property="@{name}_invalid" value="1"> - <not> - <available file="${@{name}}"/> - </not> - </condition> - <fail if="@{name}_invalid"> - Value of @{name} property is invalid. (${@{name}}). - @{msg} - </fail> - </sequential> - </macrodef> - - <target name="check-host-properties"> - <fail unless="host.name"> - host.name property not specified. Please specify property on commandline or in ${jikesrvm.dir}/.ant.properties. - </fail> + <target name="check-host-properties" depends="check-host-name"> <available property="host_file_present" file="${host.file}"/> <fail unless="host_file_present"> Host file ${host.file} not present. Please set host.name to the name of file in ${jikesrvm.dir}/build/hosts directory without the .properties suffix. @@ -208,22 +158,4 @@ </condition> </target> - <!-- **************************************************************************** --> - <!-- * * --> - <!-- * Check host and target are identical when building native components * --> - <!-- * * --> - <!-- **************************************************************************** --> - - <macrodef name="check-host-and-target-match"> - <attribute name="message"/> - <sequential> - <condition property="host_and_target_same" value="true"> - <equals arg1="${host.name}" arg2="${target.name}"/> - </condition> - <fail unless="host_and_target_same"> - Host and target are not the same and thus @{message} - </fail> - </sequential> - </macrodef> - </project> \ No newline at end of file Added: rvmroot/trunk/build/tasks.xml =================================================================== --- rvmroot/trunk/build/tasks.xml (rev 0) +++ rvmroot/trunk/build/tasks.xml 2007-01-19 01:59:11 UTC (rev 11316) @@ -0,0 +1,22 @@ +<project name="tasks"> + + <!-- **************************************************************************** --> + <!-- * * --> + <!-- * Build the ant tasks * --> + <!-- * * --> + <!-- **************************************************************************** --> + + <property name="tasks.dir" location="${build.dir}/tasks"/> + <property name="tasks.classes" location="${tasks.dir}/classes"/> + <property name="ant.jar" location="${jikesrvm.dir}/tools-external/apache-ant-1.6.5/lib/ant.jar"/> + + <target name="prepare-ant-tasks"> + <mkdir dir="${tasks.classes}"/> + <javac srcdir="${jikesrvm.dir}/tools/ant-tasks/src" destdir="${tasks.classes}" debug="true" classpath="${ant.jar}"/> + <!-- forEach is used in the test harness --> + <taskdef name="forEach" classname="com.ibm.jikesrvm.tools.ant.ForEachTask" classpath="${tasks.classes}"/> + <!-- selectRegex is used to get results from some benchmark tests --> + <taskdef name="selectRegex" classname="com.ibm.jikesrvm.tools.ant.SelectRegexTask" classpath="${tasks.classes}"/> + </target> + +</project> Property changes on: rvmroot/trunk/build/tasks.xml ___________________________________________________________________ Name: svn:mime-type + text/xml Name: svn:eol-style + native Modified: rvmroot/trunk/build/tests.xml =================================================================== --- rvmroot/trunk/build/tests.xml 2007-01-18 14:09:35 UTC (rev 11315) +++ rvmroot/trunk/build/tests.xml 2007-01-19 01:59:11 UTC (rev 11316) @@ -31,6 +31,8 @@ --> <project name="tests"> + <import file="${jikesrvm.dir}/build/tasks.xml"/> + <property name="test.suite.name" value="${ant.project.name}"/> <property name="rvm.exe" location="${test.rvm.dir}/rvm"/> @@ -48,15 +50,10 @@ <property name="test.run.id" value="${test.prefix}${test.suite.name}"/> <property name="output.dir" location="${test.rvm.dir}/tests/${test.run.id}"/> - <property name="build.dir" location="${jikesrvm.dir}/target/tests/${test.run.id}"/> + <property name="build.tests.dir" location="${build.dir}/tests/${test.run.id}"/> <property name="results.file" value="${output.dir}/Results.xml"/> - <!-- propertys for setting up tasks to help with tests --> - <property name="tasks.dir" location="${jikesrvm.dir}/target/tasks/"/> - <property name="tasks.classes" location="${tasks.dir}/classes/"/> - <property name="ant.jar" location="${jikesrvm.dir}/tools-external/apache-ant-1.6.5/lib/ant.jar"/> - <!-- **************************************************************************** --> <!-- * * --> <!-- * Macros for outputting results * --> @@ -305,7 +302,7 @@ <attribute name="rvmArgs" default=""/> <attribute name="timeLimit" default=""/> <attribute name="exitCode" default="0"/> - <attribute name="dir" default="${build.dir}"/> + <attribute name="dir" default="${build.tests.dir}"/> <sequential> <condition property="test.@{tag}.max.heapsize" value="${test.max.heapsize}" else="@{maxHeapSize}"> <equals arg1="@{maxHeapSize}" arg2=""/> @@ -400,9 +397,9 @@ rvmArgs="@{rvmArgs}" timeLimit="@{timeLimit}"/> - <echo message="@{class}" file="${build.dir}/deleteme.txt"/> - <replace file="${build.dir}/deleteme.txt" token="." value="${file.separator}"/> - <loadfile property="test.@{class}@{selector}.expected.output.file" srcFile="${build.dir}/deleteme.txt"/> + <echo message="@{class}" file="${build.tests.dir}/deleteme.txt"/> + <replace file="${build.tests.dir}/deleteme.txt" token="." value="${file.separator}"/> + <loadfile property="test.@{class}@{selector}.expected.output.file" srcFile="${build.tests.dir}/deleteme.txt"/> <diffCompareFiles tag="@{class}@{selector}" expected="${main.java}/${test.@{class}@{selector}.expected.output.file}.expected" @@ -414,24 +411,11 @@ <!-- **************************************************************************** --> <!-- * * --> - <!-- * Compile and setup SelectRegex task * --> - <!-- * * --> - <!-- **************************************************************************** --> - - <target name="prepare-tasks" depends="check-properties"> - <test-file name="ant.jar" location="${jikesrvm.dir}/.ant.properties"/> - <mkdir dir="${tasks.classes}"/> - <javac srcdir="${jikesrvm.dir}/tools/ant-tasks/src" destdir="${tasks.classes}" debug="true" classpath="${ant.jar}"/> - <taskdef name="selectRegex" classname="com.ibm.jikesrvm.tools.ant.SelectRegexTask" classpath="${tasks.classes}"/> - </target> - - <!-- **************************************************************************** --> - <!-- * * --> <!-- * Initialize properties * --> <!-- * * --> <!-- **************************************************************************** --> - <target name="init" depends="check-properties,prepare-tasks"> + <target name="init" depends="check-properties,prepare-ant-tasks"> <fail unless="test.rvm.dir" message="test.rvm.dir must be set to directory containing rvm image."/> <available property="rvm.exe_present" file="${rvm.exe}"/> <fail unless="rvm.exe_present" message="${test.rvm.dir} is not a valid rvm image. Missing rvm program."/> @@ -440,7 +424,7 @@ <test-file name="awk.exe" location="${host.file}"/> - <mkdir dir="${build.dir}"/> + <mkdir dir="${build.tests.dir}"/> <mkdir dir="${output.dir}"/> </target> @@ -451,7 +435,7 @@ <!-- **************************************************************************** --> <target name="clean" depends="init"> - <delete dir="${build.dir}"/> + <delete dir="${build.tests.dir}"/> </target> <target name="real-clean" depends="clean"> Modified: rvmroot/trunk/build.xml =================================================================== --- rvmroot/trunk/build.xml 2007-01-18 14:09:35 UTC (rev 11315) +++ rvmroot/trunk/build.xml 2007-01-19 01:59:11 UTC (rev 11316) @@ -1,6 +1,7 @@ <project name="JikesRVM" default="main" basedir="."> <property name="jikesrvm.dir" location="${basedir}"/> + <import file="build/base.xml"/> <import file="build/properties.xml"/> <import file="build/components.xml"/> @@ -40,7 +41,6 @@ <property name="generated.vmmagic.arch.java" location="${generated.dir}/vmmagic/${target.address.size}/java"/> <!-- Set the properties for distribution directory --> - <property name="dist.dir" location="dist"/> <property name="dist.base" location="${dist.dir}/${build.name}"/> <!-- **************************************************************************** --> Modified: rvmroot/trunk/testing/build.xml =================================================================== --- rvmroot/trunk/testing/build.xml 2007-01-18 14:09:35 UTC (rev 11315) +++ rvmroot/trunk/testing/build.xml 2007-01-19 01:59:11 UTC (rev 11316) @@ -1,14 +1,19 @@ <project name="TestDriver" default="report" basedir="."> + <property name="jikesrvm.dir" location=".."/> + <import file="${jikesrvm.dir}/build/base.xml"/> + <import file="${jikesrvm.dir}/build/tasks.xml"/> + <property name="tests.name" value="sanity"/> - <property name="jikesrvm.dir" location=".."/> <property file="${jikesrvm.dir}/build/testing/testsets.properties"/> <property file="${jikesrvm.dir}/build/testing/${tests.name}.properties"/> - <property name="driver.scratch.dir" location="${jikesrvm.dir}/target/test-driver"/> - <property name="results.dir" location="${driver.scratch.dir}/results"/> + <property name="driver.scratch.dir" location="${build.dir}/test-driver"/> + <property name="build.results.dir" location="${driver.scratch.dir}/results"/> + <property name="results.dir" location="${jikesrvm.dir}/results"/> + <!-- **************************************************************************** --> <!-- * * --> <!-- * Macros for executing a Test Run * --> @@ -19,7 +24,12 @@ <attribute name="tag"/> <sequential> <property name="test.run.@{tag}.configuration" value="@{tag}"/> - <property name="test.run.@{tag}.rvm.dir" location="../dist/${test.run.@{tag}.configuration}_ia32-linux"/> + <condition property="test.run.@{tag}.build.name" + value="${test.run.@{tag}.configuration}_${target.name}" + else="${test.run.@{tag}.configuration}_${target.name}_${patch.name}"> + <equals arg1="${patch.name}" arg2=""/> + </condition> + <property name="test.run.@{tag}.rvm.dir" location="${dist.dir}/${test.run.@{tag}.build.name}"/> <property name="test.run.@{tag}.name" value=""/> <property name="test.run.@{tag}.test.performance.run" value=""/> <property name="test.run.@{tag}.test.rvm.extra.args" value=""/> @@ -54,6 +64,7 @@ <testRunDisplayProperties tag="@{tag}"/> <forEach list="${test.run.@{tag}.tests}" target="run-test-suite" property="test"> <param name="tag" value="@{tag}"/> + <param name="config.name" value="${test.run.@{tag}.configuration}"/> <param name="test.rvm.dir" location="${test.run.@{tag}.rvm.dir}"/> <param name="test.run.name" value="${test.run.@{tag}.name}"/> <param name="test.performance.run" value="${test.run.@{tag}.test.performance.run}"/> @@ -81,6 +92,7 @@ <target name="run-test-suite"> <subant target="clean" failonerror="false" output="${driver.scratch.dir}/Clean-${tag}-${test}.txt"> <filelist dir="tests" files="${test}/build.xml"/> + <property name="config.name" value="${config.name}"/> <property name="test.rvm.dir" location="${test.rvm.dir}"/> <property name="test.run.name" value="${test.run.name}"/> <property name="test.performance.run" value="${test.performance.run}"/> @@ -88,6 +100,7 @@ </subant> <subant target="test" failonerror="false" output="${driver.scratch.dir}/Test-${tag}-${test}.txt"> <filelist dir="tests" files="${test}/build.xml"/> + <property name="config.name" value="${config.name}"/> <property name="test.rvm.dir" location="${test.rvm.dir}"/> <property name="test.run.name" value="${test.run.name}"/> <property name="test.performance.run" value="${test.performance.run}"/> @@ -102,17 +115,21 @@ <!-- **************************************************************************** --> <target name="aggregate" depends="test"> + <mkdir dir="${build.results.dir}"/> + <echo file="${build.results.dir}/Results.xml" append="false"><![CDATA[<master-results name="${tests.name}">]]></echo> + <forEach list="${test.runs}" target="collect-test-run-results" property="tag"/> + <echo file="${build.results.dir}/Results.xml" append="true"><![CDATA[</master-results>]]></echo> + + <tstamp prefix="report"/> <mkdir dir="${results.dir}"/> - <echo file="${results.dir}/Results.xml" append="false"><![CDATA[<master-results>]]></echo> - <forEach list="${test.runs}" target="collect-test-run-results" property="tag"/> - <echo file="${results.dir}/Results.xml" append="true"><![CDATA[</master-results>]]></echo> + <gzip src="${build.results.dir}/Results.xml" destfile="${results.dir}/${tests.name}-${report.DSTAMP}${report.TSTAMP}.xml.gz"/> </target> <macrodef name="aggregateTestRun"> <attribute name="tag"/> <sequential> <testRunPropertyInit tag="@{tag}"/> - <echo file="${results.dir}/@{tag}.xml" append="false"><![CDATA[<test-run>]]></echo> + <echo file="${build.results.dir}/@{tag}.xml" append="false"><![CDATA[<test-run tag="@{tag}">]]></echo> <condition property="test.prefix" value="" else="${test.run.@{tag}.name}_"> <equals arg1="${test.run.@{tag}.name}" arg2=""/> </condition> @@ -121,19 +138,19 @@ <param name="test.prefix" value="${test.prefix}"/> <param name="test.suite.dir" location="${test.run.@{tag}.rvm.dir}/tests"/> </forEach> - <echo file="${results.dir}/@{tag}.xml" append="true"><![CDATA[</test-run>]]></echo> + <echo file="${build.results.dir}/@{tag}.xml" append="true"><![CDATA[</test-run>]]></echo> </sequential> </macrodef> <target name="collect-test-run-results"> <aggregateTestRun tag="${tag}"/> - <concat destfile="${results.dir}/Results.xml" append="true"> - <fileset dir="${results.dir}" includes="${tag}.xml"/> + <concat destfile="${build.results.dir}/Results.xml" append="true"> + <fileset dir="${build.results.dir}" includes="${tag}.xml"/> </concat> </target> <target name="collect-test-suite-results"> - <concat destfile="${results.dir}/${tag}.xml" append="true"> + <concat destfile="${build.results.dir}/${tag}.xml" append="true"> <fileset dir="${test.suite.dir}" includes="${test.prefix}${test}/Results.xml"/> </concat> </target> @@ -172,19 +189,4 @@ <target name="build-configuration" depends="do-build-configuration"/> - <!-- **************************************************************************** --> - <!-- * * --> - <!-- * Build the ForEach task * --> - <!-- * * --> - <!-- **************************************************************************** --> - - <property name="tasks.dir" location="${jikesrvm.dir}/target/tasks"/> - <property name="tasks.classes" location="${tasks.dir}/classes"/> - <property name="ant.jar" location="${jikesrvm.dir}/tools-external/apache-ant-1.6.5/lib/ant.jar"/> - - <target name="prepare-ant-tasks"> - <mkdir dir="${tasks.classes}"/> - <javac srcdir="${jikesrvm.dir}/tools/ant-tasks/src" destdir="${tasks.classes}" debug="true" classpath="${ant.jar}"/> - <taskdef name="forEach" classname="com.ibm.jikesrvm.tools.ant.ForEachTask" classpath="${tasks.classes}"/> - </target> </project> Modified: rvmroot/trunk/testing/tests/CaffeineMark/build.xml =================================================================== --- rvmroot/trunk/testing/tests/CaffeineMark/build.xml 2007-01-18 14:09:35 UTC (rev 11315) +++ rvmroot/trunk/testing/tests/CaffeineMark/build.xml 2007-01-19 01:59:11 UTC (rev 11316) @@ -5,12 +5,10 @@ </condition> <property name="test.max.heapsize" value="200"/> - <property name="jikesrvm.dir" location="${basedir}/../../.."/> - <import file="${jikesrvm.dir}/build/properties.xml"/> - <import file="${jikesrvm.dir}/build/tests.xml"/> + <import file="../base-test-build.xml"/> <property name="main.java" location="${basedir}"/> - <property name="build.classes" location="${build.dir}/classes"/> + <property name="build.classes" location="${build.tests.dir}/classes"/> <property name="CaffeineMark.dir" value="${external.lib.dir}/CaffeineMark-3.0"/> <property name="test.class.path" value="${CaffeineMark.dir}:${build.classes}"/> Added: rvmroot/trunk/testing/tests/base-test-build.xml =================================================================== --- rvmroot/trunk/testing/tests/base-test-build.xml (rev 0) +++ rvmroot/trunk/testing/tests/base-test-build.xml 2007-01-19 01:59:11 UTC (rev 11316) @@ -0,0 +1,6 @@ +<project name="base-test-build"> + <property name="jikesrvm.dir" location="${basedir}/../../.."/> + <import file="${jikesrvm.dir}/build/base.xml"/> + <import file="${jikesrvm.dir}/build/properties.xml"/> + <import file="${jikesrvm.dir}/build/tests.xml"/> +</project> Property changes on: rvmroot/trunk/testing/tests/base-test-build.xml ___________________________________________________________________ Name: svn:mime-type + text/xml Name: svn:eol-style + native Modified: rvmroot/trunk/testing/tests/basic/build.xml =================================================================== --- rvmroot/trunk/testing/tests/basic/build.xml 2007-01-18 14:09:35 UTC (rev 11315) +++ rvmroot/trunk/testing/tests/basic/build.xml 2007-01-19 01:59:11 UTC (rev 11316) @@ -3,13 +3,11 @@ <property name="test.time.limit" value="400"/> <property name="test.max.heapsize" value="150"/> - <property name="jikesrvm.dir" location="${basedir}/../../.."/> - <import file="${jikesrvm.dir}/build/properties.xml"/> - <import file="${jikesrvm.dir}/build/tests.xml"/> + <import file="../base-test-build.xml"/> <property name="main.java" location="${basedir}/src"/> - <property name="build.classes" location="${build.dir}/classes"/> + <property name="build.classes" location="${build.tests.dir}/classes"/> <property name="test.class.path" value="${build.classes}"/> @@ -28,7 +26,7 @@ </classpath> </javac> - <jar file="${build.dir}/AgentX.jar" basedir="${build.classes}" includes="**/AgentX.class"> + <jar file="${build.tests.dir}/AgentX.jar" basedir="${build.classes}" includes="**/AgentX.class"> <manifest> <attribute name="Premain-Class" value="test.org.jikesrvm.basic.core.instrument.AgentX"/> </manifest> @@ -91,7 +89,7 @@ <runCompareTest class="test.org.jikesrvm.basic.java.nio.TestFileChannel"/> <runCompareTest class="test.org.jikesrvm.basic.core.instrument.TestAgent" - rvmArgs='-javaagent:${build.dir}/AgentX.jar="Option1"'/> + rvmArgs='-javaagent:${build.tests.dir}/AgentX.jar="Option1"'/> <outputGroupEnd/> <finishResults/> Modified: rvmroot/trunk/testing/tests/dacapo/build.xml =================================================================== --- rvmroot/trunk/testing/tests/dacapo/build.xml 2007-01-18 14:09:35 UTC (rev 11315) +++ rvmroot/trunk/testing/tests/dacapo/build.xml 2007-01-19 01:59:11 UTC (rev 11316) @@ -5,9 +5,7 @@ </condition> <property name="test.max.heapsize" value="150"/> - <property name="jikesrvm.dir" location="${basedir}/../../.."/> - <import file="${jikesrvm.dir}/build/properties.xml"/> - <import file="${jikesrvm.dir}/build/tests.xml"/> + <import file="../base-test-build.xml"/> <property name="dacapo.jar" value="${external.lib.dir}/dacapo/dacapo-2006-10.jar"/> <property name="test.class.path" value="${dacapo.jar}"/> Modified: rvmroot/trunk/testing/tests/gctest/build.xml =================================================================== --- rvmroot/trunk/testing/tests/gctest/build.xml 2007-01-18 14:09:35 UTC (rev 11315) +++ rvmroot/trunk/testing/tests/gctest/build.xml 2007-01-19 01:59:11 UTC (rev 11316) @@ -10,13 +10,11 @@ <equals arg1="${test.performance.run}" arg2="true"/> </condition> - <property name="jikesrvm.dir" location="${basedir}/../../.."/> - <import file="${jikesrvm.dir}/build/properties.xml"/> - <import file="${jikesrvm.dir}/build/tests.xml"/> + <import file="../base-test-build.xml"/> <property name="main.java" location="${basedir}/src"/> - <property name="build.classes" location="${build.dir}/classes"/> + <property name="build.classes" location="${build.tests.dir}/classes"/> <property name="test.class.path" value="${build.classes}"/> Modified: rvmroot/trunk/testing/tests/jBYTEmark/build.xml =================================================================== --- rvmroot/trunk/testing/tests/jBYTEmark/build.xml 2007-01-18 14:09:35 UTC (rev 11315) +++ rvmroot/trunk/testing/tests/jBYTEmark/build.xml 2007-01-19 01:59:11 UTC (rev 11316) @@ -3,9 +3,7 @@ <property name="test.time.limit" value="900"/> <property name="test.max.heapsize" value="150"/> - <property name="jikesrvm.dir" location="${basedir}/../../.."/> - <import file="${jikesrvm.dir}/build/properties.xml"/> - <import file="${jikesrvm.dir}/build/tests.xml"/> + <import file="../base-test-build.xml"/> <property name="jBYTEmark.jar" value="${external.lib.dir}/jBYTEmark-0.9/jBYTEmark-0.9.jar"/> <property name="test.class.path" value="${jBYTEmark.jar}"/> Modified: rvmroot/trunk/testing/tests/javalex/build.xml =================================================================== --- rvmroot/trunk/testing/tests/javalex/build.xml 2007-01-18 14:09:35 UTC (rev 11315) +++ rvmroot/trunk/testing/tests/javalex/build.xml 2007-01-19 01:59:11 UTC (rev 11316) @@ -3,12 +3,10 @@ <property name="test.time.limit" value="600"/> <property name="test.max.heapsize" value="200"/> - <property name="jikesrvm.dir" location="${basedir}/../../.."/> - <import file="${jikesrvm.dir}/build/properties.xml"/> - <import file="${jikesrvm.dir}/build/tests.xml"/> + <import file="../base-test-build.xml"/> <property name="main.java" location="${basedir}"/> - <property name="build.classes" location="${build.dir}/classes"/> + <property name="build.classes" location="${build.tests.dir}/classes"/> <property name="jlex.dir" value="${external.lib.dir}/JLex-1.2.6/classes"/> <property name="qbjc.dir" location="${external.lib.dir}/QBJC"/> @@ -27,11 +25,11 @@ <startResults/> <outputGroupStart/> - <copy file="${qbjc.dir}/qb1.lex" tofile="${build.dir}/qb1.lex"/> - <rvm tag="JLex.Main" class="JLex.Main" args="${build.dir}/qb1.lex"/> + <copy file="${qbjc.dir}/qb1.lex" tofile="${build.tests.dir}/qb1.lex"/> + <rvm tag="JLex.Main" class="JLex.Main" args="${build.tests.dir}/qb1.lex"/> <diffCompareFiles tag="JLex.Main" expected="qb1.lex.ref.classpath" - actual="${build.dir}/qb1.lex.java"/> + actual="${build.tests.dir}/qb1.lex.java"/> <outputResults tag="JLex.Main"/> <outputGroupEnd/> <finishResults/> Modified: rvmroot/trunk/testing/tests/jgf/build.xml =================================================================== --- rvmroot/trunk/testing/tests/jgf/build.xml 2007-01-18 14:09:35 UTC (rev 11315) +++ rvmroot/trunk/testing/tests/jgf/build.xml 2007-01-19 01:59:11 UTC (rev 11316) @@ -5,12 +5,10 @@ </condition> <property name="test.size" value="0"/> - <property name="jikesrvm.dir" location="${basedir}/../../.."/> - <import file="${jikesrvm.dir}/build/properties.xml"/> - <import file="${jikesrvm.dir}/build/tests.xml"/> + <import file="../base-test-build.xml"/> <property name="main.java" location="${basedir}"/> - <property name="build.classes" location="${build.dir}/classes"/> + <property name="build.classes" location="${build.tests.dir}/classes"/> <property name="jgf.dir" value="${external.lib.dir}/JavaGrandeForum/v2.0"/> <property name="test.class.path" value="${build.classes}"/> Added: rvmroot/trunk/testing/tests/jgf-threads/build.xml =================================================================== --- rvmroot/trunk/testing/tests/jgf-threads/build.xml (rev 0) +++ rvmroot/trunk/testing/tests/jgf-threads/build.xml 2007-01-19 01:59:11 UTC (rev 11316) @@ -0,0 +1,108 @@ +<project name="jgf-threads" default="test" basedir="."> + + <condition property="test.time.limit" value="14400" else="7200"> + <equals arg1="${test.performance.run}" arg2="true"/> + </condition> + + <condition property="test.size" value="1" else="0"> + <equals arg1="${test.performance.run}" arg2="true"/> + </condition> + + <property name="test.thread-count" value="100"/> + <property name="test.initial.heapsize" value="200"/> + + <import file="../base-test-build.xml"/> + + <property name="main.java" location="${basedir}"/> + <property name="build.classes" location="${build.tests.dir}/classes"/> + + <property name="jgf-threads.dir" value="${external.lib.dir}/JavaGrandeForum/threadv1.0"/> + <property name="test.class.path" value="${build.classes}"/> + + <!-- **************************************************************************** --> + <!-- * * --> + <!-- * Compile the tests * --> + <!-- * * --> + <!-- **************************************************************************** --> + + <target name="compile" depends="init"> + <mkdir dir="${build.classes}"/> + <javac srcdir="${main.java}" destdir="${build.classes}" debug="true" source="1.4" + sourcepath="${main.java}:${jgf-threads.dir}:${jgf-threads.dir}/section1:${jgf-threads.dir}/section2:${jgf-threads.dir}/section3"/> + </target> + + <!-- **************************************************************************** --> + <!-- * * --> + <!-- * Macro to extract results * --> + <!-- * * --> + <!-- **************************************************************************** --> + + <macrodef name="score"> + <attribute name="name"/> + <sequential> + <extractStatistic tag="JGF_MultithreadedBenchmark" key="@{name}" pattern="@{name}\s*(\S*)\s*\(.*\)"/> + </sequential> + </macrodef> + + <macrodef name="score2"> + <attribute name="name"/> + <sequential> + <extractStatistic tag="JGF_MultithreadedBenchmark" key="@{name}.time" pattern="@{name}\s*(\S*)\s*\(s\).*\(.*\)"/> + <extractStatistic tag="JGF_MultithreadedBenchmark" key="@{name}.score" pattern="@{name}.*\(s\)\s*(\S*)\s*\(.*\)"/> + </sequential> + </macrodef> + + <!-- **************************************************************************** --> + <!-- * * --> + <!-- * Run the tests * --> + <!-- * * --> + <!-- **************************************************************************** --> + + <target name="test" depends="compile"> + <test-property name="external.lib.dir" location="${jikesrvm.dir}/.ant.properties"/> + <test-file name="jgf-threads.dir" location="${jikesrvm.dir}/.ant.properties"/> + + <rvm tag="JGF_MultithreadedBenchmark" + class="JGF_MultithreadedBenchmark" + args="${test.size} ${test.thread-count}" + dir="${jgf-threads.dir}/section3"/> + + <startResults/> + <outputGroupStart/> + <outputTestStart tag="JGF_MultithreadedBenchmark"/> + + <outputStatisticStart/> + + <!-- TODO: Check the following works --> + + <score name="Section1:Barrier:Simple"/> + <score name="Section1:Barrier:Tournament"/> + <score name="Section1:ForkJoin:Simple"/> + <score name="Section1:Sync:Method"/> + <score name="Section1:Sync:Object"/> + + <score name="Section2:Series:Kernel:SizeA"/> + <score name="Section2:LUFact:Kernel:SizeA"/> + <score name="Section2:Crypt:Kernel:SizeA"/> + <score name="Section2:SOR:Kernel:SizeA"/> + <score name="Section2:SparseMatmult:Kernel:SizeA"/> + + <score name="Section3:MolDyn:Run:SizeA"/> + <score name="Section3:MolDyn:Total:SizeA"/> + <score2 name="Section3:MonteCarlo:Run:SizeA"/> + <score2 name="Section3:MonteCarlo:Total:SizeA"/> + <score2 name="Section3:RayTracer:Init:SizeA"/> + <score2 name="Section3:RayTracer:Run:SizeA"/> + <score2 name="Section3:RayTracer:Total:SizeA"/> + + <outputStatisticEnd/> + + <outputTestResults tag="JGF_MultithreadedBenchmark"/> + <outputTestEnd/> + <displayTestResults tag="JGF_MultithreadedBenchmark"/> + + <outputGroupEnd/> + <finishResults/> + </target> + +</project> Property changes on: rvmroot/trunk/testing/tests/jgf-threads/build.xml ___________________________________________________________________ Name: svn:mime-type + text/xml Name: svn:eol-style + native Modified: rvmroot/trunk/testing/tests/jni/build.xml =================================================================== --- rvmroot/trunk/testing/tests/jni/build.xml 2007-01-18 14:09:35 UTC (rev 11315) +++ rvmroot/trunk/testing/tests/jni/build.xml 2007-01-19 01:59:11 UTC (rev 11316) @@ -3,14 +3,12 @@ <property name="test.max.heapsize" value="64"/> <property name="test.time.limit" value="180"/> - <property name="jikesrvm.dir" location="${basedir}/../../.."/> - <import file="${jikesrvm.dir}/build/properties.xml"/> - <import file="${jikesrvm.dir}/build/tests.xml"/> + <import file="../base-test-build.xml"/> <property name="main.java" location="${basedir}/src"/> - <property name="build.classes" location="${build.dir}/classes"/> - <property name="build.native" location="${build.dir}/native"/> + <property name="build.classes" location="${build.tests.dir}/classes"/> + <property name="build.native" location="${build.tests.dir}/native"/> <property name="test.class.path" value="${build.classes}"/> @@ -31,10 +29,10 @@ <arg value="-I${build.native}"/> <arg value="-I${jikesrvm.dir}/include"/> <arg value="-o"/> - <arg value="${build.dir}/${target.dll-prefix}@{class}${target.dll-ext}"/> + <arg value="${build.tests.dir}/${target.dll-prefix}@{class}${target.dll-ext}"/> <arg value="${main.java}/@{class}.c"/> </exec> - <rvm tag="@{class}" class="@{class}" args="-quiet" rvmArgs="-Djava.library.path=${build.dir}"/> + <rvm tag="@{class}" class="@{class}" args="-quiet" rvmArgs="-Djava.library.path=${build.tests.dir}"/> <selectRegex property="test.@{class}.pass" select="" file="${test.@{class}.sanitized.output.file}" Modified: rvmroot/trunk/testing/tests/opttests/build.xml =================================================================== --- rvmroot/trunk/testing/tests/opttests/build.xml 2007-01-18 14:09:35 UTC (rev 11315) +++ rvmroot/trunk/testing/tests/opttests/build.xml 2007-01-19 01:59:11 UTC (rev 11316) @@ -3,13 +3,11 @@ <property name="test.time.limit" value="400"/> <property name="test.max.heapsize" value="150"/> - <property name="jikesrvm.dir" location="${basedir}/../../.."/> - <import file="${jikesrvm.dir}/build/properties.xml"/> - <import file="${jikesrvm.dir}/build/tests.xml"/> + <import file="../base-test-build.xml"/> <property name="main.java" location="${basedir}/src"/> - <property name="build.classes" location="${build.dir}/classes"/> + <property name="build.classes" location="${build.tests.dir}/classes"/> <property name="test.class.path" value="${build.classes}"/> Modified: rvmroot/trunk/testing/tests/soot/build.xml =================================================================== --- rvmroot/trunk/testing/tests/soot/build.xml 2007-01-18 14:09:35 UTC (rev 11315) +++ rvmroot/trunk/testing/tests/soot/build.xml 2007-01-19 01:59:11 UTC (rev 11316) @@ -5,12 +5,10 @@ </condition> <property name="test.max.heapsize" value="200"/> - <property name="jikesrvm.dir" location="${basedir}/../../.."/> - <import file="${jikesrvm.dir}/build/properties.xml"/> - <import file="${jikesrvm.dir}/build/tests.xml"/> + <import file="../base-test-build.xml"/> <property name="main.java" location="${basedir}"/> - <property name="build.classes" location="${build.dir}/classes"/> + <property name="build.classes" location="${build.tests.dir}/classes"/> <property name="dacapo.jar" value="${external.lib.dir}/dacapo/dacapo-2006-10.jar"/> <property name="soot.dir" location="${external.lib.dir}/soot-2.2.3"/> @@ -49,7 +47,7 @@ <outputGroupStart/> <rvm tag="soot.Main" class="soot.Main" - args="-O --app -time -d ${build.dir} --soot-classpath ${test.rvm.dir}/jksvm.jar:${test.rvm.dir}/rvmrt.jar:${soot.class.path} ${soot.class} -f J"/> + args="-O --app -time -d ${build.tests.dir} --soot-classpath ${test.rvm.dir}/jksvm.jar:${test.rvm.dir}/rvmrt.jar:${soot.class.path} ${soot.class} -f J"/> <outputSingleStatisticResults tag="soot.Main" key="time" pattern="totalTime:(.*)s \(100.0\%\)"/> <outputGroupEnd/> <finishResults/> Modified: rvmroot/trunk/testing/tests/xerces/build.xml =================================================================== --- rvmroot/trunk/testing/tests/xerces/build.xml 2007-01-18 14:09:35 UTC (rev 11315) +++ rvmroot/trunk/testing/tests/xerces/build.xml 2007-01-19 01:59:11 UTC (rev 11316) @@ -6,9 +6,7 @@ <!-- TODO: when in performance run Use iteration driver and execute twice --> <property name="test.max.heapsize" value="200"/> - <property name="jikesrvm.dir" location="${basedir}/../../.."/> - <import file="${jikesrvm.dir}/build/properties.xml"/> - <import file="${jikesrvm.dir}/build/tests.xml"/> + <import file="../base-test-build.xml"/> <property name="xerces.dir" location="${external.lib.dir}/xerces-2_8_1"/> <property name="shakespeare.dir" location="${external.lib.dir}/xmlFiles/shakespeare.1.10.xml"/> @@ -102,9 +100,9 @@ <include name="*.xml"/> </fileset> <property name="xml.files" refid="xml.files"/> - <echo file="${build.dir}/FileList.txt">input.xml.files=${xml.files}</echo> - <replace file="${build.dir}/FileList.txt" token=";" value=" "/> - <property file="${build.dir}/FileList.txt"/> + <echo file="${build.tests.dir}/FileList.txt">input.xml.files=${xml.files}</echo> + <replace file="${build.tests.dir}/FileList.txt" token=";" value=" "/> + <property file="${build.tests.dir}/FileList.txt"/> <startResults/> <outputGroupStart/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |