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/02/20 13:09:58 UTC
svn commit: r509528 - in /harmony/enhanced/drlvm/trunk/build/make/targets:
jvmti.test.xml kernel.test.xml smoke.test.xml
Author: varlax
Date: Tue Feb 20 04:09:57 2007
New Revision: 509528
URL: http://svn.apache.org/viewvc?view=rev&rev=509528
Log:
HARMONY-3201 [drlvm][testing] empty exclude list should be used if no exclude exist
Modified:
harmony/enhanced/drlvm/trunk/build/make/targets/jvmti.test.xml
harmony/enhanced/drlvm/trunk/build/make/targets/kernel.test.xml
harmony/enhanced/drlvm/trunk/build/make/targets/smoke.test.xml
Modified: harmony/enhanced/drlvm/trunk/build/make/targets/jvmti.test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/targets/jvmti.test.xml?view=diff&rev=509528&r1=509527&r2=509528
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/targets/jvmti.test.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/targets/jvmti.test.xml Tue Feb 20 04:09:57 2007
@@ -120,22 +120,24 @@
<target name="run-jvmti-tests">
<propertycopy property="mode.name" from="${jvmti.tests.mode}.name" override="on"/>
<propertycopy property="mode.switch" from="${jvmti.tests.mode}.switch" override="on"/>
- <if>
- <available file="./excludes/exclude.drlvm_jvmti.${hy.platform}.${jvmti.tests.mode}" />
- <then>
- <property name="exclude.file" location="./excludes/exclude.drlvm_jvmti.${hy.platform}.${jvmti.tests.mode}" />
- </then>
- <else>
- <tempfile property="temp.file" />
- <touch file="${temp.file}" />
- <property name="exclude.file" location="${temp.file}" />
- </else>
- </if>
<echo>
==================================
Run JVMTI tests using ${mode.name}
==================================
</echo>
+ <property name="exclude.file" location="./excludes/exclude.drlvm_jvmti.${hy.platform}.${jvmti.tests.mode}" />
+ <if>
+ <available file="${exclude.file}" />
+ <then>
+ <property name="jvmti.exclude.file.${jvmti.tests.mode}.present" value="true" />
+ <loadfile property="foo" srcFile="${exclude.file}"/>
+ <echo>
+Using exclude file = ${exclude.file}
+
+${foo}
+ </echo>
+ </then>
+ </if>
<property name="report.dir"
location="${jvmti.test.dir}/reports/${jvmti.tests.mode}"/>
@@ -171,7 +173,7 @@
<batchtest todir="${report.dir}">
<fileset dir="${jvmti.test.src}" >
<include name="**/${testname}.java"/>
- <excludesfile name="${exclude.file}" />
+ <excludesfile name="${exclude.file}" if="jvmti.exclude.file.${jvmti.tests.mode}.present"/>
</fileset>
</batchtest>
</junit>
@@ -184,14 +186,6 @@
</sequential>
</for>
- <if>
- <not>
- <contains string="${exclude.file}" substring="${jvmti.tests.mode}" />
- </not>
- <then>
- <delete file="${exclude.file}" quiet="true" failonerror="false" />
- </then>
- </if>
</target>
<target name="jvmti.test" depends="pre-jvmti-test">
Modified: harmony/enhanced/drlvm/trunk/build/make/targets/kernel.test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/targets/kernel.test.xml?view=diff&rev=509528&r1=509527&r2=509528
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/targets/kernel.test.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/targets/kernel.test.xml Tue Feb 20 04:09:57 2007
@@ -25,24 +25,6 @@
<property name="test.jvm.exe" value="${build.deploy.dir}/jdk/jre/bin/java"/>
<property file="test.properties"/>
- <!-- no longer used - leaving here temporarily to be sure people like the change
- <patternset id="kernel.test.java.pattern">
- <include name="org/apache/harmony/**/*Test.java" />
- <include name="java/lang/**/*Test*.java" />
-
- **These tests are too slow **
- <exclude name="java/lang/RuntimeAdditionalTest*.java" />
-
- ** These tests are unstable and hang often **
- <exclude name="java/lang/RuntimeAdditionalTest11.java" />
- <exclude name="java/lang/RuntimeAdditionalTest34.java" />
- <exclude name="java/lang/RuntimeAdditionalTest39.java" />
- <exclude name="java/lang/RuntimeAdditionalTest40.java" />
- <exclude name="java/lang/RuntimeAdditionalTest41.java" />
- <exclude name="java/lang/RuntimeAdditionalTest42.java" />
- </patternset>
- -->
-
<target name="kernel.test"
depends="compile-kernel-test, run-kernel-test, report-kernel-test, check-kernel-test"/>
@@ -127,20 +109,24 @@
<target name="-run-kernel-test-batch">
<propertycopy property="kernel.mode.name" from="${kernel.mode}.name" override="on"/>
<propertycopy property="kernel.mode.switch" from="${kernel.mode}.switch" override="on"/>
-
- <property name="exclude.file" location="./excludes/exclude.drlvm_kernel.${hy.platform}.${kernel.mode}" />
-
- <loadfile property="foo" srcFile="${exclude.file}"/>
-
<echo>
==================================
Run kernel tests using ${kernel.mode.name}
==================================
-
+ </echo>
+ <property name="exclude.file" location="./excludes/exclude.drlvm_kernel.${hy.platform}.${kernel.mode}" />
+ <if>
+ <available file="${exclude.file}" />
+ <then>
+ <property name="kernel.exclude.file.${kernel.mode}.present" value="true" />
+ <loadfile property="foo" srcFile="${exclude.file}"/>
+ <echo>
Using exclude file = ${exclude.file}
${foo}
- </echo>
+ </echo>
+ </then>
+ </if>
<property name="report.dir"
location="${kernel.test.dir}/reports/${kernel.mode}.mode"/>
@@ -163,7 +149,7 @@
<!-- <patternset refid="kernel.test.java.pattern"/> -->
<include name="org/apache/harmony/**/*Test.java" />
<include name="java/lang/**/*Test*.java" />
- <excludesfile name="${exclude.file}" />
+ <excludesfile name="${exclude.file}" if="kernel.exclude.file.${kernel.mode}.present" />
</fileset>
</batchtest>
Modified: harmony/enhanced/drlvm/trunk/build/make/targets/smoke.test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/targets/smoke.test.xml?view=diff&rev=509528&r1=509527&r2=509528
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/targets/smoke.test.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/targets/smoke.test.xml Tue Feb 20 04:09:57 2007
@@ -141,11 +141,6 @@
<propertycopy property="mode.name" from="${jit.or.interpreter}.name" override="on"/>
<propertycopy property="mode.switch" from="${jit.or.interpreter}.switch" override="on"/>
- <condition property="using.jit.or.jitrino" value="Using interpreter">
- <contains string="${jit.or.interpreter}" substring="int" />
- </condition>
- <property name="using.jit.or.jitrino" value="Using jitrino" />
- <echo message="${using.jit.or.jitrino}" />
<property name="classes.location" location="${smoke.test.src}" />
<pathconvert property="java.path.property" refid="java.class.path" />
<condition property="int.or.jit.exclude" value="X_int,X_interpreter">
@@ -158,26 +153,30 @@
</condition>
<property name="int.or.jit.arg" value="" />
- <property name="exclude.file" location="./excludes/exclude.drlvm_smoke.${hy.platform}.${jit.or.interpreter}" />
-
- <loadfile property="foo" srcFile="${exclude.file}"/>
-
<echo>
==================================
- Smoke tests
+ Smoke tests on ${mode.name}
==================================
-
-Excluding Tests from ${exclude.file}
+ </echo>
+ <property name="exclude.file" location="./excludes/exclude.drlvm_smoke.${hy.platform}.${jit.or.interpreter}" />
+ <if>
+ <available file="${exclude.file}" />
+ <then>
+ <property name="smoke.exclude.file.${jit.or.interpreter}.present" value="true" />
+ <loadfile property="foo" srcFile="${exclude.file}"/>
+ <echo>
+Using exclude file = ${exclude.file}
${foo}
-------------------------------------------------
- </echo>
+ </echo>
+ </then>
+ </if>
<for param="test">
<fileset dir="${smoke.test.src}">
<!-- <patternset refid="smoke.test.java.pattern" /> -->
<include name="**/*.java"/>
<!-- <exclude name="**/Logger.java"/> -->
- <excludesfile name="${exclude.file}" />
+ <excludesfile name="${exclude.file}" if="smoke.exclude.file.${jit.or.interpreter}.present" />
</fileset>
<sequential>