You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by va...@apache.org on 2007/10/15 08:49:49 UTC
svn commit: r584696 - in /harmony/enhanced/drlvm/trunk/build/make: build.xml
targets/cunit.test.xml
Author: varlax
Date: Sun Oct 14 23:49:49 2007
New Revision: 584696
URL: http://svn.apache.org/viewvc?rev=584696&view=rev
Log:
Traget "test" must really fail on errors.
Modified:
harmony/enhanced/drlvm/trunk/build/make/build.xml
harmony/enhanced/drlvm/trunk/build/make/targets/cunit.test.xml
Modified: harmony/enhanced/drlvm/trunk/build/make/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/build.xml?rev=584696&r1=584695&r2=584696&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/build.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/build.xml Sun Oct 14 23:49:49 2007
@@ -242,6 +242,8 @@
<!-- semi-built component location -->
<property name="build.semi.dir" location="../${build.os.short}_${build.arch}_${build.cxx}_${build.cfg}/semis" />
<mkdir dir="${build.semi.dir}" />
+
+ <property name="base.test.dir" location="${build.semi.dir}/../tests"/>
<property name="generated.properties.file" value="${build.semi.dir}/env.properties" />
@@ -438,16 +440,15 @@
<target name="test2" depends="init">
<property file="test.properties"/>
<property name="run.all.tests" value="true"/>
- <property name="base.test.dir" location="${build.semi.dir}/../tests"/>
<mkdir dir="${base.test.dir}"/>
<parallel threadsPerProcessor="1" failonany="no">
- <ant target="hut.test" output="${base.test.dir}/hut.log"/>
- <ant antfile="targets/kernel.test.xml" target="kernel.test" output="${base.test.dir}/kernel.log"/>
- <ant antfile="targets/ehwa.test.xml" target="ehwa" output="${base.test.dir}/ehwa.log"/>
- <ant antfile="targets/jvmti.test.xml" target="jvmti.test" output="${base.test.dir}/jvmti.log"/>
- <ant antfile="targets/smoke.test.xml" target="smoke.test" output="${base.test.dir}/smoke.log"/>
- <ant antfile="targets/reg.test.xml" target="reg.test" output="${base.test.dir}/reg.log"/>
- <ant target="cunit.test" output="${base.test.dir}/cunit.log"/>
+ <ant target="hut.test" output="${base.test.dir}/hut.log"/>
+ <ant target="kernel.test" output="${base.test.dir}/kernel.log"/>
+ <ant target="ehwa" output="${base.test.dir}/ehwa.log"/>
+ <ant target="jvmti.test" output="${base.test.dir}/jvmti.log"/>
+ <ant target="smoke.test" output="${base.test.dir}/smoke.log"/>
+ <ant target="reg.test" output="${base.test.dir}/reg.log"/>
+ <ant target="cunit.test" output="${base.test.dir}/cunit.log"/>
</parallel>
<fail if="test.failed" message="Some tests failed"/>
</target>
@@ -464,31 +465,37 @@
<property name="_component" value="vm" />
<property name="_target" value="cunit.test" />
</subant>
+ <available property="test.failed" file="${base.test.dir}/cunit.test.failed" />
</target>
<!-- Main target to run smoke tests -->
<target name="smoke.test" depends="init">
<ant antfile="targets/smoke.test.xml" target="smoke.test"/>
+ <available property="test.failed" file="${base.test.dir}/smoke.test.failed" />
</target>
<!-- Main target to run kernel tests -->
<target name="kernel.test" depends="extern_dep,init" >
<ant antfile="targets/kernel.test.xml" target="kernel.test"/>
+ <available property="test.failed" file="${base.test.dir}/kernel.test.failed" />
</target>
<!-- Main target to run Eclipse HelloWorld test scenario -->
<target name="ehwa.test" depends="init" >
<ant antfile="targets/ehwa.test.xml" target="ehwa"/>
+ <available property="test.failed" file="${base.test.dir}/ehwa.test.failed" />
</target>
<!-- Main target to run jvmti tests /-->
<target name="jvmti.test" depends="init">
<ant antfile="targets/jvmti.test.xml" target="jvmti.test"/>
+ <available property="test.failed" file="${base.test.dir}/jvmti.test.failed" />
</target>
<!-- Main target to run regression test /-->
<target name="reg.test" depends="init">
<ant antfile="targets/reg.test.xml" target="reg.test"/>
+ <available property="test.failed" file="${base.test.dir}/reg.test.failed" />
</target>
<!-- process (build/create javadoc/etc...) all the specified components -->
Modified: harmony/enhanced/drlvm/trunk/build/make/targets/cunit.test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/targets/cunit.test.xml?rev=584696&r1=584695&r2=584696&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/targets/cunit.test.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/targets/cunit.test.xml Sun Oct 14 23:49:49 2007
@@ -270,11 +270,6 @@
</else>
</if>
- <!-- Overall status property -->
- <condition property="test.failed">
- <isfalse value="${@{file}.status}"/>
- </condition>
-
</sequential>
</for>
</target>
@@ -282,6 +277,7 @@
<target name="cunit-report">
<gen-test-report dir="${cunit.test.dir}/reports"/>
<echo message="Please find tests and results at ${cunit.test.dir}" />
+ <available property="test.failed" file="${cunit.test.summary}" />
<fail unless="run.all.tests" if="test.failed" message="Some cunit tests failed"/>
</target>