From: <pet...@us...> - 2007-01-29 01:11:25
|
Revision: 11391 http://svn.sourceforge.net/jikesrvm/?rev=11391&view=rev Author: peter_donald Date: 2007-01-28 17:11:24 -0800 (Sun, 28 Jan 2007) Log Message: ----------- Make the test driver pass in base intermediate directory which means that individual tests no longer need to have their own cleans run Modified Paths: -------------- rvmroot/trunk/build/tests.xml rvmroot/trunk/testing/build.xml Modified: rvmroot/trunk/build/tests.xml =================================================================== --- rvmroot/trunk/build/tests.xml 2007-01-29 01:02:36 UTC (rev 11390) +++ rvmroot/trunk/build/tests.xml 2007-01-29 01:11:24 UTC (rev 11391) @@ -48,7 +48,7 @@ <property name="test.run.id" value="${test.prefix}${test.suite.name}"/> <property name="output.dir" location="${test.results.dir}/${test.run.id}"/> - <property name="build.tests.dir" location="${build.dir}/tests/${test.run.id}"/> + <property name="build.tests.dir" location="${test.build.dir}/${test.run.id}"/> <property name="results.file" value="${output.dir}/Results.xml"/> @@ -484,6 +484,8 @@ </fail> <test-file name="awk.exe" location="${host.file}"/> + <fail unless="test.build.dir" + message="test.build.dir must be set to directory to contain intermediate build artifacts."/> <fail unless="test.results.dir" message="test.results.dir must be set to directory to contain results."/> <fail unless="test.rvm.dir" message="test.rvm.dir must be set to directory containing rvm image."/> Modified: rvmroot/trunk/testing/build.xml =================================================================== --- rvmroot/trunk/testing/build.xml 2007-01-29 01:02:36 UTC (rev 11390) +++ rvmroot/trunk/testing/build.xml 2007-01-29 01:11:24 UTC (rev 11391) @@ -6,17 +6,16 @@ <property name="tests.name" value="sanity"/> - <property name="test.results.dir" value="${results.dir}/tests/${tests.name}"/> - <property file="${jikesrvm.dir}/build/testing/${tests.name}.properties"/> <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"/> + <property name="test.results.dir" value="${results.dir}/tests/${tests.name}"/> + <property name="test.build.dir" value="${build.dir}/tests/${tests.name}"/> + <property name="results.archive" location="${results.dir}/archive"/> - <property name="results.weekly" location="${results.dir}/archive"/> - <property name="weeklys.dir" location="${results.dir}/weekly"/> + <property name="results.weekly" location="${results.dir}/weekly"/> <!-- properties defining mailer properties--> <property name="mail.from" value="jik...@li..."/> @@ -54,7 +53,9 @@ <target name="test" depends="prepare-ant-tasks"> <delete dir="${driver.scratch.dir}"/> + <delete dir="${test.build.dir}"/> <delete dir="${test.results.dir}"/> + <mkdir dir="${driver.scratch.dir}"/> <forEach list="${test.runs}" property="tag"> <sequential> @@ -82,22 +83,11 @@ <echo message=" Extra Flags?: ${test.run.@{tag}.test.rvm.extra.args}"/> <forEach list="${test.run.@{tag}.tests}" property="test"> <sequential> - <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="${test.run.@{tag}.configuration}"/> - <property name="test.results.dir" value="${test.results.dir}"/> - <property name="test.rvm.dir" location="${test.run.@{tag}.rvm.dir}"/> - <property name="test.run.name" value="${test.run.@{tag}.name}"/> - <property name="test.mode" value="${test.run.@{tag}.test.mode}"/> - <property name="test.rvm.extra.args" value="${test.run.@{tag}.test.rvm.extra.args}"/> - <propertyset> - <propertyref prefix="exclude."/> - </propertyset> - </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="${test.run.@{tag}.configuration}"/> <property name="test.results.dir" value="${test.results.dir}"/> + <property name="test.build.dir" value="${test.build.dir}"/> <property name="test.rvm.dir" location="${test.run.@{tag}.rvm.dir}"/> <property name="test.run.name" value="${test.run.@{tag}.name}"/> <property name="test.mode" value="${test.run.@{tag}.test.mode}"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |