You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by sm...@apache.org on 2007/03/23 06:33:22 UTC
svn commit: r521594 - in /harmony/enhanced/classlib/trunk/modules:
accessibility/ annotation/ applet/ archive/ auth/ awt/ beans/ concurrent/
crypto/ imageio/ instrument/ jndi/ logging/ luni/ math/ misc/ nio/
nio_char/ pack200/ prefs/ print/ regex/ rmi/...
Author: smishura
Date: Thu Mar 22 22:33:20 2007
New Revision: 521594
URL: http://svn.apache.org/viewvc?view=rev&rev=521594
Log:
Apply patch for the rest of modules from HARMONY-3187:
([classlib][testing] test case should be run only once when specified through the command line)
Modified:
harmony/enhanced/classlib/trunk/modules/accessibility/build.xml
harmony/enhanced/classlib/trunk/modules/annotation/build.xml
harmony/enhanced/classlib/trunk/modules/applet/build.xml
harmony/enhanced/classlib/trunk/modules/archive/build.xml
harmony/enhanced/classlib/trunk/modules/auth/build.xml
harmony/enhanced/classlib/trunk/modules/awt/build.xml
harmony/enhanced/classlib/trunk/modules/beans/build.xml
harmony/enhanced/classlib/trunk/modules/concurrent/build.xml
harmony/enhanced/classlib/trunk/modules/crypto/build.xml
harmony/enhanced/classlib/trunk/modules/imageio/build.xml
harmony/enhanced/classlib/trunk/modules/instrument/build.xml
harmony/enhanced/classlib/trunk/modules/jndi/build.xml
harmony/enhanced/classlib/trunk/modules/logging/build.xml
harmony/enhanced/classlib/trunk/modules/luni/build.xml
harmony/enhanced/classlib/trunk/modules/math/build.xml
harmony/enhanced/classlib/trunk/modules/misc/build.xml
harmony/enhanced/classlib/trunk/modules/nio/build.xml
harmony/enhanced/classlib/trunk/modules/nio_char/build.xml
harmony/enhanced/classlib/trunk/modules/pack200/build.xml
harmony/enhanced/classlib/trunk/modules/prefs/build.xml
harmony/enhanced/classlib/trunk/modules/print/build.xml
harmony/enhanced/classlib/trunk/modules/regex/build.xml
harmony/enhanced/classlib/trunk/modules/rmi/build.xml
harmony/enhanced/classlib/trunk/modules/security/build.xml
harmony/enhanced/classlib/trunk/modules/sound/build.xml
harmony/enhanced/classlib/trunk/modules/sql/build.xml
harmony/enhanced/classlib/trunk/modules/suncompat/build.xml
harmony/enhanced/classlib/trunk/modules/swing/build.xml
harmony/enhanced/classlib/trunk/modules/text/build.xml
harmony/enhanced/classlib/trunk/modules/tools/build.xml
harmony/enhanced/classlib/trunk/modules/x-net/build.xml
Modified: harmony/enhanced/classlib/trunk/modules/accessibility/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/accessibility/build.xml?view=diff&rev=521594&r1=521593&r2=521594
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/accessibility/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/accessibility/build.xml Thu Mar 22 22:33:20 2007
@@ -187,14 +187,14 @@
<formatter type="xml" />
- <test name="${test.case}" todir="${hy.tests.reports}"
- if="test.case" />
-
- <batchtest todir="${hy.tests.reports}" haltonfailure="no"
- unless="test.case">
+ <batchtest todir="${hy.tests.reports}" haltonfailure="no">
<fileset dir="${hy.accessibility.src.test.api}/java/common">
- <excludesfile name="${accessibility.exclude.file}" />
+ <!-- if ${test.case} -->
+ <include name="${converted.tc}" if="test.case" />
+ <!-- unless ${test.case} -->
+ <include name="**/*.java" unless="test.case" />
+ <excludesfile name="${accessibility.exclude.file}" unless="test.case"/>
</fileset>
</batchtest>
</junit>
Modified: harmony/enhanced/classlib/trunk/modules/annotation/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/annotation/build.xml?view=diff&rev=521594&r1=521593&r2=521594
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/annotation/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/annotation/build.xml Thu Mar 22 22:33:20 2007
@@ -171,14 +171,14 @@
<formatter type="xml" />
- <test name="${test.case}" todir="${hy.tests.reports}"
- if="test.case" />
-
- <batchtest todir="${hy.tests.reports}" haltonfailure="no"
- unless="test.case">
+ <batchtest todir="${hy.tests.reports}" haltonfailure="no" >
<fileset dir="${hy.annotation.src.test.java}">
- <excludesfile name="${annotation.exclude.file}" />
+ <!-- if ${test.case} -->
+ <include name="${converted.tc}" if="test.case" />
+ <!-- unless ${test.case} -->
+ <include name="**/*Test.java" unless="test.case" />
+ <excludesfile name="${annotation.exclude.file}" unless="test.case" />
</fileset>
</batchtest>
</junit>
Modified: harmony/enhanced/classlib/trunk/modules/applet/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/applet/build.xml?view=diff&rev=521594&r1=521593&r2=521594
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/applet/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/applet/build.xml Thu Mar 22 22:33:20 2007
@@ -169,14 +169,14 @@
<formatter type="xml" />
- <test name="${test.case}" todir="${hy.tests.reports}"
- if="test.case" />
-
- <batchtest todir="${hy.tests.reports}" haltonfailure="no"
- unless="test.case">
+ <batchtest todir="${hy.tests.reports}" haltonfailure="no" >
<fileset dir="${hy.applet.src.test.java}">
- <excludesfile name="${applet.exclude.file}" />
+ <!-- if ${test.case} -->
+ <include name="${converted.tc}" if="test.case" />
+ <!-- unless ${test.case} -->
+ <include name="**/Test.java" unless="test.case" />
+ <excludesfile name="${applet.exclude.file}" unless="test.case" />
</fileset>
</batchtest>
</junit>
Modified: harmony/enhanced/classlib/trunk/modules/archive/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/archive/build.xml?view=diff&rev=521594&r1=521593&r2=521594
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/archive/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/archive/build.xml Thu Mar 22 22:33:20 2007
@@ -237,15 +237,14 @@
<formatter type="xml" />
- <test name="${test.case}" todir="${hy.tests.reports}"
- if="test.case" />
-
- <batchtest todir="${hy.tests.reports}" haltonfailure="no"
- unless="test.case">
+ <batchtest todir="${hy.tests.reports}" haltonfailure="no" >
<fileset dir="${hy.archive.src.test.java}">
- <include name="**/*Test.java"/>
- <excludesfile name="${archive.exclude.file}" />
+ <!-- if ${test.case} -->
+ <include name="${converted.tc}" if="test.case" />
+ <!-- unless ${test.case} -->
+ <include name="**/*Test.java" unless="test.case" />
+ <excludesfile name="${archive.exclude.file}" unless="test.case" />
</fileset>
</batchtest>
</junit>
Modified: harmony/enhanced/classlib/trunk/modules/auth/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/auth/build.xml?view=diff&rev=521594&r1=521593&r2=521594
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/auth/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/auth/build.xml Thu Mar 22 22:33:20 2007
@@ -219,18 +219,21 @@
<formatter type="xml" />
- <test name="${test.case}" todir="${hy.tests.reports}"
- if="test.case" />
-
- <batchtest todir="${hy.tests.reports}" haltonfailure="no"
- unless="test.case">
+ <batchtest todir="${hy.tests.reports}" haltonfailure="no" >
<fileset dir="${hy.auth.src.test.java.platform}">
- <include name="**/*Test.java"/>
+ <!-- if ${test.case} -->
+ <include name="${converted.tc}" if="test.case" />
+ <!-- unless ${test.case} -->
+ <include name="**/*Test.java" unless="test.case" />
+ <excludesfile name="${auth.exclude.file}" unless="test.case" />
</fileset>
<fileset dir="${hy.auth.src.test.java}">
- <include name="**/*Test.java"/>
- <excludesfile name="${auth.exclude.file}" />
+ <!-- if ${test.case} -->
+ <include name="${converted.tc}" if="test.case" />
+ <!-- unless ${test.case} -->
+ <include name="**/*Test.java" unless="test.case" />
+ <excludesfile name="${auth.exclude.file}" unless="test.case" />
<!-- Not a test -->
<exclude name="org/apache/harmony/auth/internal/SecurityTest.java"/>
Modified: harmony/enhanced/classlib/trunk/modules/awt/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/build.xml?view=diff&rev=521594&r1=521593&r2=521594
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/build.xml Thu Mar 22 22:33:20 2007
@@ -319,20 +319,22 @@
<formatter type="xml" />
- <test name="${test.case}" todir="${hy.tests.reports}"
- if="test.case" />
-
- <batchtest todir="${hy.tests.reports}" haltonfailure="no"
- unless="test.case">
+ <batchtest todir="${hy.tests.reports}" haltonfailure="no" >
<fileset dir="${hy.awt.src.test.api}/java/common">
- <include name="**/*Test.java"/>
- <excludesfile name="${awt.exclude.file}" />
+ <!-- if ${test.case} -->
+ <include name="${converted.tc}" if="test.case" />
+ <!-- unless ${test.case} -->
+ <include name="**/*Test.java" unless="test.case" />
+ <excludesfile name="${awt.exclude.file}" unless="test.case"/>
<exclude name="**/*Headless*Test.java"/>
</fileset>
<fileset dir="${hy.awt.src.test.api.java.platform}">
- <include name="**/*Test.java"/>
- <excludesfile name="${awt.exclude.file}" />
+ <!-- if ${test.case} -->
+ <include name="${converted.tc}" if="test.case" />
+ <!-- unless ${test.case} -->
+ <include name="**/*Test.java" unless="test.case" />
+ <excludesfile name="${awt.exclude.file}" unless="test.case"/>
<exclude name="**/*Headless*Test.java"/>
</fileset>
</batchtest>
@@ -356,16 +358,21 @@
<formatter type="xml" />
- <batchtest todir="${hy.tests.reports}" haltonfailure="no"
- unless="test.case">
+ <batchtest todir="${hy.tests.reports}" haltonfailure="no" >
<fileset dir="${hy.awt.src.test.api}/java/common">
- <include name="**/*Headless*Test.java"/>
- <excludesfile name="${awt.exclude.file}" />
+ <!-- if ${test.case} -->
+ <include name="${converted.tc}" if="test.case" />
+ <!-- unless ${test.case} -->
+ <include name="**/*Headless*Test.java" unless="test.case" />
+ <excludesfile name="${awt.exclude.file}" unless="test.case"/>
</fileset>
<fileset dir="${hy.awt.src.test.api.java.platform}">
- <include name="**/*Headless*Test.java"/>
- <excludesfile name="${awt.exclude.file}" />
+ <!-- if ${test.case} -->
+ <include name="${converted.tc}" if="test.case" />
+ <!-- unless ${test.case} -->
+ <include name="**/*Headless*Test.java" unless="test.case" />
+ <excludesfile name="${awt.exclude.file}" unless="test.case"/>
</fileset>
</batchtest>
</junit>
Modified: harmony/enhanced/classlib/trunk/modules/beans/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/beans/build.xml?view=diff&rev=521594&r1=521593&r2=521594
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/beans/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/beans/build.xml Thu Mar 22 22:33:20 2007
@@ -226,14 +226,14 @@
<formatter type="xml" />
- <test name="${test.case}" todir="${hy.tests.reports}"
- if="test.case" />
-
- <batchtest todir="${hy.tests.reports}" haltonfailure="no"
- unless="test.case">
+ <batchtest todir="${hy.tests.reports}" haltonfailure="no" >
<fileset dir="${hy.beans.src.test.internal}">
- <include name="**/*Test.java"/>
+ <!-- if ${test.case} -->
+ <include name="${converted.tc}" if="test.case" />
+ <!-- unless ${test.case} -->
+ <include name="**/*Test.java" unless="test.case" />
+ <excludesfile name="${beans.exclude.file}" unless="test.case" />
</fileset>
</batchtest>
</junit>
@@ -262,15 +262,14 @@
<formatter type="xml" />
- <test name="${test.case}" todir="${hy.tests.reports}"
- if="test.case" />
-
- <batchtest todir="${hy.tests.reports}" haltonfailure="no"
- unless="test.case">
+ <batchtest todir="${hy.tests.reports}" haltonfailure="no" >
<fileset dir="${hy.beans.src.test.java}">
- <include name="**/*Test.java"/>
- <excludesfile name="${beans.exclude.file}" />
+ <!-- if ${test.case} -->
+ <include name="${converted.tc}" if="test.case" />
+ <!-- unless ${test.case} -->
+ <include name="**/*Test.java" unless="test.case" />
+ <excludesfile name="${beans.exclude.file}" unless="test.case" />
</fileset>
</batchtest>
</junit>
Modified: harmony/enhanced/classlib/trunk/modules/concurrent/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/concurrent/build.xml?view=diff&rev=521594&r1=521593&r2=521594
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/concurrent/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/concurrent/build.xml Thu Mar 22 22:33:20 2007
@@ -176,16 +176,14 @@
<formatter type="xml" />
- <test name="${test.case}" todir="${hy.tests.reports}"
- if="test.case" />
-
- <batchtest todir="${hy.tests.reports}" haltonfailure="no"
- unless="test.case">
-
+ <batchtest todir="${hy.tests.reports}" haltonfailure="no" >
<fileset dir="${hy.concurrent.src.test.java}">
- <excludesfile name="${concurrent.exclude.file}" />
+ <!-- if ${test.case} -->
+ <include name="${converted.tc}" if="test.case" />
+ <!-- unless ${test.case} -->
+ <include name="**/*Test.java" unless="test.case" />
+ <excludesfile name="${concurrent.exclude.file}" unless="test.case" />
</fileset>
-
</batchtest>
</junit>
<antcall target="touch-failures-file" />
Modified: harmony/enhanced/classlib/trunk/modules/crypto/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/crypto/build.xml?view=diff&rev=521594&r1=521593&r2=521594
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/crypto/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/crypto/build.xml Thu Mar 22 22:33:20 2007
@@ -183,10 +183,13 @@
<pathelement path="../../build/tests" />
</classpath>
- <batchtest todir="${hy.tests.reports}" haltonfailure="no" unless="test.case">
+ <batchtest todir="${hy.tests.reports}" haltonfailure="no" >
<fileset dir="${hy.crypto.src.test}/api/java">
- <include name="**/*Test.java"/>
- <excludesfile name="${crypto.exclude.file}" />
+ <!-- if ${test.case} -->
+ <include name="${converted.tc}" if="test.case" />
+ <!-- unless ${test.case} -->
+ <include name="**/*Test.java" unless="test.case" />
+ <excludesfile name="${crypto.exclude.file}" unless="test.case" />
</fileset>
</batchtest>
@@ -198,10 +201,13 @@
<!-- to pick up junit.jar -->
<jvmarg value="-Xbootclasspath/a:${hy.crypto.bin.test}/api.injected${path.separator}../../${junit.jar}${path.separator}../../build/tests${path.separator}${hy.hdk}/build/test/support.jar"/>
- <batchtest todir="${hy.tests.reports}" haltonfailure="no" unless="test.case">
+ <batchtest todir="${hy.tests.reports}" haltonfailure="no" >
<fileset dir="${hy.crypto.src.test}/api/java.injected">
- <include name="**/*Test.java"/>
- <excludesfile name="${crypto.exclude.file}" />
+ <!-- if ${test.case} -->
+ <include name="${converted.tc}" if="test.case" />
+ <!-- unless ${test.case} -->
+ <include name="**/*Test.java" unless="test.case" />
+ <excludesfile name="${crypto.exclude.file}" unless="test.case" />
</fileset>
</batchtest>
@@ -220,10 +226,13 @@
<pathelement path="${hy.hdk}/build/test/support.jar" />
</classpath>
- <batchtest todir="${hy.tests.reports}" haltonfailure="no" unless="test.case">
+ <batchtest todir="${hy.tests.reports}" haltonfailure="no" >
<fileset dir="${hy.crypto.src.test}/impl/java">
- <include name="**/*Test.java"/>
- <excludesfile name="${crypto.exclude.file}" />
+ <!-- if ${test.case} -->
+ <include name="${converted.tc}" if="test.case" />
+ <!-- unless ${test.case} -->
+ <include name="**/*Test.java" unless="test.case" />
+ <excludesfile name="${crypto.exclude.file}" unless="test.case" />
</fileset>
</batchtest>
@@ -235,10 +244,13 @@
<!-- to pick up junit.jar -->
<jvmarg value="-Xbootclasspath/a:${hy.crypto.bin.test}/impl.injected${path.separator}../../${junit.jar}${path.separator}../../build/tests"/>
- <batchtest todir="${hy.tests.reports}" haltonfailure="no" unless="test.case">
+ <batchtest todir="${hy.tests.reports}" haltonfailure="no" >
<fileset dir="${hy.crypto.src.test}/impl/java.injected">
- <include name="**/*Test.java"/>
- <excludesfile name="${crypto.exclude.file}" />
+ <!-- if ${test.case} -->
+ <include name="${converted.tc}" if="test.case" />
+ <!-- unless ${test.case} -->
+ <include name="**/*Test.java" unless="test.case" />
+ <excludesfile name="${crypto.exclude.file}" unless="test.case" />
</fileset>
</batchtest>
@@ -320,8 +332,6 @@
</classpath>
<formatter type="xml" />
-
- <test name="${test.case}" todir="${hy.tests.reports}" if="test.case" />
</junit>
</sequential>
</macrodef>
Modified: harmony/enhanced/classlib/trunk/modules/imageio/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/imageio/build.xml?view=diff&rev=521594&r1=521593&r2=521594
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/imageio/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/imageio/build.xml Thu Mar 22 22:33:20 2007
@@ -190,22 +190,20 @@
<jvmarg line="${hy.test.vmargs}" />
- <env key="JAVA_HOME" value="${test.jre.home}"/>
-
<classpath>
<pathelement path="${hy.imageio.bin.test}"/>
</classpath>
<formatter type="xml" />
- <test name="${test.case}" todir="${hy.tests.reports}"
- if="test.case" />
-
- <batchtest todir="${hy.tests.reports}" haltonfailure="no"
- unless="test.case">
+ <batchtest todir="${hy.tests.reports}" haltonfailure="no" >
<fileset dir="${hy.imageio.src.test.java}" >
- <excludesfile name="${imageio.exclude.file}" />
+ <!-- if ${test.case} -->
+ <include name="${converted.tc}" if="test.case" />
+ <!-- unless ${test.case} -->
+ <include name="**/*.java" unless="test.case" />
+ <excludesfile name="${imageio.exclude.file}" unless="test.case" />
</fileset>
</batchtest>
</junit>
Modified: harmony/enhanced/classlib/trunk/modules/instrument/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/instrument/build.xml?view=diff&rev=521594&r1=521593&r2=521594
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/instrument/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/instrument/build.xml Thu Mar 22 22:33:20 2007
@@ -209,15 +209,14 @@
<formatter type="xml" />
- <test name="${test.case}" todir="${hy.tests.reports}"
- if="test.case" />
-
- <batchtest todir="${hy.tests.reports}" haltonfailure="no"
- unless="test.case">
+ <batchtest todir="${hy.tests.reports}" haltonfailure="no" >
<fileset dir="${hy.instrument.src.test.java}">
- <include name="**/*Test.java" />
- <excludesfile name="${instrument.exclude.file}" />
+ <!-- if ${test.case} -->
+ <include name="${converted.tc}" if="test.case" />
+ <!-- unless ${test.case} -->
+ <include name="**/*Test.java" unless="test.case" />
+ <excludesfile name="${instrument.exclude.file}" unless="test.case" />
</fileset>
</batchtest>
</junit>
Modified: harmony/enhanced/classlib/trunk/modules/jndi/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/jndi/build.xml?view=diff&rev=521594&r1=521593&r2=521594
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/jndi/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/jndi/build.xml Thu Mar 22 22:33:20 2007
@@ -172,22 +172,20 @@
<formatter type="xml" />
- <test name="${test.case}" todir="${hy.tests.reports}"
- if="test.case" />
-
-
- <batchtest todir="${hy.tests.reports}" haltonfailure="no"
- unless="test.case">
+ <batchtest todir="${hy.tests.reports}" haltonfailure="no" >
<fileset dir="${hy.jndi.src.test.java}">
- <include name="**/*Test.java"/>
- <include name="**/Test*.java"/>
- <excludesfile name="${jndi.exclude.file}" />
+ <!-- if ${test.case} -->
+ <include name="${converted.tc}" if="test.case" />
+ <!-- unless ${test.case} -->
+ <include name="**/*Test.java" unless="test.case" />
+ <include name="**/Test*.java" unless="test.case" />
+ <excludesfile name="${jndi.exclude.file}" unless="test.case" />
<!-- These tests run in a separate jvm below -->
- <exclude name="org/apache/harmony/jndi/tests/javax/naming/spi/NamingManagerBuilderTest.java" />
- <exclude name="org/apache/harmony/jndi/tests/javax/naming/spi/NamingManagerTest.java" />
- <exclude name="org/apache/harmony/jndi/tests/javax/naming/spi/DirectoryManagerTest.java" />
+ <exclude name="org/apache/harmony/jndi/tests/javax/naming/spi/NamingManagerBuilderTest.java" unless="test.case" />
+ <exclude name="org/apache/harmony/jndi/tests/javax/naming/spi/NamingManagerTest.java" unless="test.case" />
+ <exclude name="org/apache/harmony/jndi/tests/javax/naming/spi/DirectoryManagerTest.java" unless="test.case" />
</fileset>
</batchtest>
Modified: harmony/enhanced/classlib/trunk/modules/logging/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/logging/build.xml?view=diff&rev=521594&r1=521593&r2=521594
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/logging/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/logging/build.xml Thu Mar 22 22:33:20 2007
@@ -192,9 +192,6 @@
<formatter type="xml" />
- <test name="${test.case}" todir="${hy.tests.reports}"
- if="test.case" />
-
<!-- run LogManagerTest in separated VM -->
<batchtest todir="${hy.tests.reports}" haltonfailure="no"
unless="test.case">
@@ -205,14 +202,16 @@
</fileset>
</batchtest>
- <batchtest todir="${hy.tests.reports}" haltonfailure="no"
- unless="test.case">
+ <batchtest todir="${hy.tests.reports}" haltonfailure="no" >
<fileset dir="${hy.logging.src.test.java}">
- <include name="org/apache/harmony/logging/tests/java/util/logging/*Test.java"/>
- <excludesfile name="${logging.exclude.file}" />
+ <!-- if ${test.case} -->
+ <include name="${converted.tc}" if="test.case" />
+ <!-- unless ${test.case} -->
+ <include name="org/apache/harmony/logging/tests/java/util/logging/*Test.java" unless="test.case" />
+ <excludesfile name="${logging.exclude.file}" unless="test.case" />
- <exclude name="org/apache/harmony/logging/tests/java/util/logging/LogManagerTest.java" />
+ <exclude name="org/apache/harmony/logging/tests/java/util/logging/LogManagerTest.java" unless="test.case" />
</fileset>
</batchtest>
</junit>
Modified: harmony/enhanced/classlib/trunk/modules/luni/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/build.xml?view=diff&rev=521594&r1=521593&r2=521594
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/build.xml Thu Mar 22 22:33:20 2007
@@ -293,10 +293,13 @@
<jvmarg value="-Dtest.ini.file=../../support/src/test/resources/config/localhosttest.ini" />
- <batchtest todir="${hy.tests.reports}" haltonfailure="no" unless="test.case">
+ <batchtest todir="${hy.tests.reports}" haltonfailure="no" >
<fileset dir="${hy.luni.src.test}/java">
- <include name="**/*Test.java"/>
- <excludesfile name="${luni.exclude.file}" />
+ <!-- if ${test.case} -->
+ <include name="${converted.tc}" if="test.case" />
+ <!-- unless ${test.case} -->
+ <include name="**/*Test.java" unless="test.case" />
+ <excludesfile name="${luni.exclude.file}" unless="test.case" />
</fileset>
</batchtest>
@@ -391,8 +394,6 @@
<junit-elements />
<formatter type="xml" />
-
- <test name="${test.case}" todir="${hy.tests.reports}" if="test.case" />
</junit>
</sequential>
</macrodef>
Modified: harmony/enhanced/classlib/trunk/modules/math/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/math/build.xml?view=diff&rev=521594&r1=521593&r2=521594
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/math/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/math/build.xml Thu Mar 22 22:33:20 2007
@@ -172,15 +172,14 @@
<formatter type="xml" />
- <test name="${test.case}" todir="${hy.tests.reports}"
- if="test.case" />
-
- <batchtest todir="${hy.tests.reports}" haltonfailure="no"
- unless="test.case">
+ <batchtest todir="${hy.tests.reports}" haltonfailure="no" >
<fileset dir="${hy.math.src.test.java}">
- <include name="**/*Test.java" />
- <excludesfile name="${math.exclude.file}" />
+ <!-- if ${test.case} -->
+ <include name="${converted.tc}" if="test.case" />
+ <!-- unless ${test.case} -->
+ <include name="**/*Test.java" unless="test.case" />
+ <excludesfile name="${math.exclude.file}" unless="test.case" />
</fileset>
</batchtest>
</junit>
Modified: harmony/enhanced/classlib/trunk/modules/misc/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/misc/build.xml?view=diff&rev=521594&r1=521593&r2=521594
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/misc/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/misc/build.xml Thu Mar 22 22:33:20 2007
@@ -191,15 +191,14 @@
<formatter type="xml" />
- <test name="${test.case}" todir="${hy.tests.reports}"
- if="test.case" />
-
- <batchtest todir="${hy.tests.reports}" haltonfailure="no"
- unless="test.case">
+ <batchtest todir="${hy.tests.reports}" haltonfailure="no" >
<fileset dir="${hy.misc.src.test.java}">
- <include name="**/*Test.java" />
- <excludesfile name="${misc.exclude.file}" />
+ <!-- if ${test.case} -->
+ <include name="${converted.tc}" if="test.case" />
+ <!-- unless ${test.case} -->
+ <include name="**/*Test.java" unless="test.case" />
+ <excludesfile name="${misc.exclude.file}" unless="test.case" />
</fileset>
</batchtest>
</junit>
Modified: harmony/enhanced/classlib/trunk/modules/nio/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/nio/build.xml?view=diff&rev=521594&r1=521593&r2=521594
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/nio/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/nio/build.xml Thu Mar 22 22:33:20 2007
@@ -204,16 +204,20 @@
<formatter type="xml" />
- <test name="${test.case}" todir="${hy.tests.reports}" if="test.case" />
-
- <batchtest todir="${hy.tests.reports}" haltonfailure="no" unless="test.case">
+ <batchtest todir="${hy.tests.reports}" haltonfailure="no" >
<fileset dir="${hy.nio.src.test.java}">
- <include name="**/*Test.java" />
- <excludesfile name="${nio.exclude.file}" />
+ <!-- if ${test.case} -->
+ <include name="${converted.tc}" if="test.case" />
+ <!-- unless ${test.case} -->
+ <include name="**/*Test.java" unless="test.case" />
+ <excludesfile name="${nio.exclude.file}" unless="test.case" />
</fileset>
<fileset dir="${hy.nio.src.test.java.platform}">
- <include name="**/*Test.java" />
- <excludesfile name="${nio.exclude.file}" />
+ <!-- if ${test.case} -->
+ <include name="${converted.tc}" if="test.case" />
+ <!-- unless ${test.case} -->
+ <include name="**/*Test.java" unless="test.case" />
+ <excludesfile name="${nio.exclude.file}" unless="test.case" />
</fileset>
</batchtest>
</junit>
Modified: harmony/enhanced/classlib/trunk/modules/nio_char/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/nio_char/build.xml?view=diff&rev=521594&r1=521593&r2=521594
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/nio_char/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/nio_char/build.xml Thu Mar 22 22:33:20 2007
@@ -179,15 +179,14 @@
<formatter type="xml" />
- <test name="${test.case}" todir="${hy.tests.reports}"
- if="test.case" />
-
- <batchtest todir="${hy.tests.reports}" haltonfailure="no"
- unless="test.case">
+ <batchtest todir="${hy.tests.reports}" haltonfailure="no" >
<fileset dir="${hy.nio_char.src.test.java}">
- <include name="**/*Test.java"/>
- <excludesfile name="${nio_char.exclude.file}" />
+ <!-- if ${test.case} -->
+ <include name="${converted.tc}" if="test.case" />
+ <!-- unless ${test.case} -->
+ <include name="**/*Test.java" unless="test.case" />
+ <excludesfile name="${nio_char.exclude.file}" unless="test.case" />
</fileset>
</batchtest>
</junit>
Modified: harmony/enhanced/classlib/trunk/modules/pack200/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/build.xml?view=diff&rev=521594&r1=521593&r2=521594
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/build.xml Thu Mar 22 22:33:20 2007
@@ -203,15 +203,14 @@
<formatter type="xml" />
- <test name="${test.case}" todir="${hy.tests.reports}"
- if="test.case" />
-
- <batchtest todir="${hy.tests.reports}" haltonfailure="no"
- unless="test.case">
+ <batchtest todir="${hy.tests.reports}" haltonfailure="no" >
<fileset dir="${hy.pack200.src.test.java}">
- <include name="**/*Test.java"/>
- <excludesfile name="${pack200.exclude.file}" />
+ <!-- if ${test.case} -->
+ <include name="${converted.tc}" if="test.case" />
+ <!-- unless ${test.case} -->
+ <include name="**/*Test.java" unless="test.case" />
+ <excludesfile name="${pack200.exclude.file}" unless="test.case" />
</fileset>
</batchtest>
</junit>
Modified: harmony/enhanced/classlib/trunk/modules/prefs/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/prefs/build.xml?view=diff&rev=521594&r1=521593&r2=521594
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/prefs/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/prefs/build.xml Thu Mar 22 22:33:20 2007
@@ -197,15 +197,14 @@
<formatter type="xml" />
- <test name="${test.case}" todir="${hy.tests.reports}"
- if="test.case" />
-
- <batchtest todir="${hy.tests.reports}" haltonfailure="no"
- unless="test.case">
+ <batchtest todir="${hy.tests.reports}" haltonfailure="no" >
<fileset dir="${hy.prefs.src.test.java}">
- <include name="**/*Test.java"/>
- <excludesfile name="${prefs.exclude.file}" />
+ <!-- if ${test.case} -->
+ <include name="${converted.tc}" if="test.case" />
+ <!-- unless ${test.case} -->
+ <include name="**/*Test.java" unless="test.case" />
+ <excludesfile name="${prefs.exclude.file}" unless="test.case" />
</fileset>
</batchtest>
</junit>
Modified: harmony/enhanced/classlib/trunk/modules/print/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/print/build.xml?view=diff&rev=521594&r1=521593&r2=521594
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/print/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/print/build.xml Thu Mar 22 22:33:20 2007
@@ -213,15 +213,14 @@
<formatter type="xml" />
- <test name="${test.case}" todir="${hy.tests.reports}"
- if="test.case" />
-
- <batchtest todir="${hy.tests.reports}" haltonfailure="no"
- unless="test.case">
+ <batchtest todir="${hy.tests.reports}" haltonfailure="no" >
<fileset dir="${hy.print.src.test.java}">
- <!--include name="**/*Test.java"/-->
- <excludesfile name="${print.exclude.file}" />
+ <!-- if ${test.case} -->
+ <include name="${converted.tc}" if="test.case" />
+ <!-- unless ${test.case} -->
+ <include name="**/*.java" unless="test.case" />
+ <excludesfile name="${print.exclude.file}" unless="test.case" />
</fileset>
</batchtest>
</junit>
Modified: harmony/enhanced/classlib/trunk/modules/regex/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/regex/build.xml?view=diff&rev=521594&r1=521593&r2=521594
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/regex/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/regex/build.xml Thu Mar 22 22:33:20 2007
@@ -176,15 +176,14 @@
<formatter type="xml" />
- <test name="${test.case}" todir="${hy.tests.reports}"
- if="test.case" />
-
- <batchtest todir="${hy.tests.reports}" haltonfailure="no"
- unless="test.case">
+ <batchtest todir="${hy.tests.reports}" haltonfailure="no" >
<fileset dir="${hy.regex.src.test.java}">
- <include name="**/*Test.java"/>
- <excludesfile name="${regex.exclude.file}" />
+ <!-- if ${test.case} -->
+ <include name="${converted.tc}" if="test.case" />
+ <!-- unless ${test.case} -->
+ <include name="**/*Test.java" unless="test.case" />
+ <excludesfile name="${regex.exclude.file}" unless="test.case" />
</fileset>
</batchtest>
</junit>
Modified: harmony/enhanced/classlib/trunk/modules/rmi/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/rmi/build.xml?view=diff&rev=521594&r1=521593&r2=521594
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/rmi/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/rmi/build.xml Thu Mar 22 22:33:20 2007
@@ -151,10 +151,13 @@
<pathelement path="../../build/tests"/>
</classpath>
- <batchtest todir="${hy.tests.reports}" haltonfailure="no" unless="test.case">
+ <batchtest todir="${hy.tests.reports}" haltonfailure="no" >
<fileset dir="${hy.rmi.src.test}/api/java">
- <include name="**/*Test.java"/>
- <excludesfile name="${rmi.exclude.file}" />
+ <!-- if ${test.case} -->
+ <include name="${converted.tc}" if="test.case" />
+ <!-- unless ${test.case} -->
+ <include name="**/*Test.java" unless="test.case" />
+ <excludesfile name="${rmi.exclude.file}" unless="test.case" />
</fileset>
</batchtest>
@@ -236,8 +239,6 @@
</classpath>
<formatter type="xml" />
-
- <test name="${test.case}" todir="${hy.tests.reports}" if="test.case" />
</junit>
</sequential>
</macrodef>
Modified: harmony/enhanced/classlib/trunk/modules/security/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/security/build.xml?view=diff&rev=521594&r1=521593&r2=521594
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/security/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/security/build.xml Thu Mar 22 22:33:20 2007
@@ -284,10 +284,13 @@
<pathelement path="${hy.hdk}/build/test/support.jar" />
</classpath>
- <batchtest todir="${hy.tests.reports}" haltonfailure="no" unless="test.case">
+ <batchtest todir="${hy.tests.reports}" haltonfailure="no" >
<fileset dir="${hy.security.src.test}/api/java">
- <include name="**/*Test.java"/>
- <excludesfile name="${security.exclude.file}" />
+ <!-- if ${test.case} -->
+ <include name="${converted.tc}" if="test.case" />
+ <!-- unless ${test.case} -->
+ <include name="**/*Test.java" unless="test.case" />
+ <excludesfile name="${security.exclude.file}" unless="test.case" />
</fileset>
</batchtest>
@@ -299,10 +302,13 @@
<!-- to pick up junit.jar -->
<jvmarg value="-Xbootclasspath/a:${tests.hdk.dir}/${hy.security.packaging.jarname}_tests_api_in.jar${path.separator}../../${junit.jar}${path.separator}../../build/tests${path.separator}${hy.hdk}/build/test/support.jar${path.separator}${tests.hdk.dir}/${hy.security.packaging.jarname}_tests_support.jar"/>
- <batchtest todir="${hy.tests.reports}" haltonfailure="no" unless="test.case">
+ <batchtest todir="${hy.tests.reports}" haltonfailure="no" >
<fileset dir="${hy.security.src.test}/api/java.injected">
- <include name="**/*Test.java"/>
- <excludesfile name="${security.exclude.file}" />
+ <!-- if ${test.case} -->
+ <include name="${converted.tc}" if="test.case" />
+ <!-- unless ${test.case} -->
+ <include name="**/*Test.java" unless="test.case" />
+ <excludesfile name="${security.exclude.file}" unless="test.case" />
</fileset>
</batchtest>
@@ -322,11 +328,13 @@
<pathelement path="${hy.hdk}/build/test/support.jar" />
</classpath>
- <batchtest todir="${hy.tests.reports}" haltonfailure="no" unless="test.case">
+ <batchtest todir="${hy.tests.reports}" haltonfailure="no" >
<fileset dir="${hy.security.src.test}/impl/java">
- <include name="**/*Test.java"/>
- <excludesfile name="${security.exclude.file}" />
- <exclude name="${hy.security.x-list}" />
+ <!-- if ${test.case} -->
+ <include name="${converted.tc}" if="test.case" />
+ <!-- unless ${test.case} -->
+ <include name="**/*Test.java" unless="test.case" />
+ <excludesfile name="${security.exclude.file}" unless="test.case" />
</fileset>
</batchtest>
@@ -338,13 +346,13 @@
<!-- to pick up junit.jar -->
<jvmarg value="-Xbootclasspath/a:${tests.hdk.dir}/${hy.security.packaging.jarname}_tests_impl_in.jar${path.separator}../../${junit.jar}${path.separator}${hy.hdk}/build/test/support.jar${path.separator}${tests.hdk.dir}/${hy.security.packaging.jarname}_tests_support.jar"/>
- <batchtest todir="${hy.tests.reports}" haltonfailure="no" unless="test.case">
+ <batchtest todir="${hy.tests.reports}" haltonfailure="no" >
<fileset dir="${hy.security.src.test}/impl/java.injected">
- <include name="**/*Test.java"/>
- <excludesfile name="${security.exclude.file}" />
-
- <exclude name="${hy.security.x-list}" />
-
+ <!-- if ${test.case} -->
+ <include name="${converted.tc}" if="test.case" />
+ <!-- unless ${test.case} -->
+ <include name="**/*Test.java" unless="test.case" />
+ <excludesfile name="${security.exclude.file}" unless="test.case" />
</fileset>
</batchtest>
@@ -424,8 +432,6 @@
</classpath>
<formatter type="xml" />
-
- <test name="${test.case}" todir="${hy.tests.reports}" if="test.case" />
</junit>
</sequential>
</macrodef>
Modified: harmony/enhanced/classlib/trunk/modules/sound/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/sound/build.xml?view=diff&rev=521594&r1=521593&r2=521594
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/sound/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/sound/build.xml Thu Mar 22 22:33:20 2007
@@ -182,15 +182,14 @@
<classpath location="${hy.hdk}/build/test/resources/sound/org/apache/harmony/sound/tests/javax/sound/sampled/soundProvider.jar" />
<formatter type="xml" />
- <test name="${test.case}" todir="${hy.tests.reports}"
- if="test.case" />
-
- <batchtest todir="${hy.tests.reports}" haltonfailure="no"
- unless="test.case">
+ <batchtest todir="${hy.tests.reports}" haltonfailure="no" >
<fileset dir="${hy.sound.src.test.java}">
- <!--include name="**/*Test.java"/-->
- <excludesfile name="${sound.exclude.file}" />
+ <!-- if ${test.case} -->
+ <include name="${converted.tc}" if="test.case" />
+ <!-- unless ${test.case} -->
+ <include name="**/*.java" unless="test.case" />
+ <excludesfile name="${sound.exclude.file}" unless="test.case" />
</fileset>
</batchtest>
</junit>
Modified: harmony/enhanced/classlib/trunk/modules/sql/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/sql/build.xml?view=diff&rev=521594&r1=521593&r2=521594
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/sql/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/sql/build.xml Thu Mar 22 22:33:20 2007
@@ -172,15 +172,14 @@
<formatter type="xml" />
- <test name="${test.case}" todir="${hy.tests.reports}"
- if="test.case" />
-
- <batchtest todir="${hy.tests.reports}" haltonfailure="no"
- unless="test.case">
+ <batchtest todir="${hy.tests.reports}" haltonfailure="no" >
<fileset dir="${hy.sql.src.test.java}">
- <include name="**/*Test.java"/>
- <excludesfile name="${sql.exclude.file}" />
+ <!-- if ${test.case} -->
+ <include name="${converted.tc}" if="test.case" />
+ <!-- unless ${test.case} -->
+ <include name="**/*Test.java" unless="test.case" />
+ <excludesfile name="${sql.exclude.file}" unless="test.case" />
</fileset>
</batchtest>
</junit>
Modified: harmony/enhanced/classlib/trunk/modules/suncompat/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/suncompat/build.xml?view=diff&rev=521594&r1=521593&r2=521594
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/suncompat/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/suncompat/build.xml Thu Mar 22 22:33:20 2007
@@ -170,15 +170,14 @@
<formatter type="xml" />
- <test name="${test.case}" todir="${hy.tests.reports}"
- if="test.case" />
-
- <batchtest todir="${hy.tests.reports}" haltonfailure="no"
- unless="test.case">
+ <batchtest todir="${hy.tests.reports}" haltonfailure="no" >
<fileset dir="${hy.suncompat.src.test.java}">
- <include name="**/*Test.java"/>
- <excludesfile name="${suncompat.exclude.file}" />
+ <!-- if ${test.case} -->
+ <include name="${converted.tc}" if="test.case" />
+ <!-- unless ${test.case} -->
+ <include name="**/*Test.java" unless="test.case" />
+ <excludesfile name="${suncompat.exclude.file}" unless="test.case" />
</fileset>
</batchtest>
</junit>
Modified: harmony/enhanced/classlib/trunk/modules/swing/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/build.xml?view=diff&rev=521594&r1=521593&r2=521594
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/swing/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/swing/build.xml Thu Mar 22 22:33:20 2007
@@ -196,17 +196,17 @@
<formatter type="xml" />
- <test name="${test.case}" todir="${hy.tests.reports}"
- if="test.case" />
<jvmarg value="-Xbootclasspath/a:${hy.swing.bin.test}${path.separator}../../${junit.jar}${path.separator}${hy.hdk}/build/test/support.jar"/>
<!-- <jvmarg value="-Djava2d.opengl=true"/> -->
- <batchtest todir="${hy.tests.reports}" haltonfailure="no"
- unless="test.case">
+ <batchtest todir="${hy.tests.reports}" haltonfailure="no" >
<fileset dir="${hy.swing.src.test.api}/java/common">
- <include name="**/*Test.java"/>
- <excludesfile name="${swing.exclude.file}" />
+ <!-- if ${test.case} -->
+ <include name="${converted.tc}" if="test.case" />
+ <!-- unless ${test.case} -->
+ <include name="**/*Test.java" unless="test.case" />
+ <excludesfile name="${swing.exclude.file}" unless="test.case" />
</fileset>
</batchtest>
</junit>
Modified: harmony/enhanced/classlib/trunk/modules/text/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/text/build.xml?view=diff&rev=521594&r1=521593&r2=521594
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/text/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/text/build.xml Thu Mar 22 22:33:20 2007
@@ -190,15 +190,14 @@
<formatter type="xml" />
- <test name="${test.case}" todir="${hy.tests.reports}"
- if="test.case" />
-
- <batchtest todir="${hy.tests.reports}" haltonfailure="no"
- unless="test.case">
+ <batchtest todir="${hy.tests.reports}" haltonfailure="no" >
<fileset dir="${hy.text.src.test.java}">
- <include name="**/*Test.java"/>
- <excludesfile name="${text.exclude.file}" />
+ <!-- if ${test.case} -->
+ <include name="${converted.tc}" if="test.case" />
+ <!-- unless ${test.case} -->
+ <include name="**/*Test.java" unless="test.case" />
+ <excludesfile name="${text.exclude.file}" unless="test.case" />
</fileset>
</batchtest>
</junit>
Modified: harmony/enhanced/classlib/trunk/modules/tools/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/tools/build.xml?view=diff&rev=521594&r1=521593&r2=521594
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/tools/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/tools/build.xml Thu Mar 22 22:33:20 2007
@@ -182,15 +182,14 @@
<formatter type="xml" />
- <test name="${test.case}" todir="${hy.tests.reports}"
- if="test.case" />
-
- <batchtest todir="${hy.tests.reports}" haltonfailure="no"
- unless="test.case">
+ <batchtest todir="${hy.tests.reports}" haltonfailure="no" >
<fileset dir="${hy.tools.src.test.java}">
- <include name="**/*Test.java"/>
- <excludesfile name="${tools.exclude.file}" />
+ <!-- if ${test.case} -->
+ <include name="${converted.tc}" if="test.case" />
+ <!-- unless ${test.case} -->
+ <include name="**/*Test.java" unless="test.case" />
+ <excludesfile name="${tools.exclude.file}" unless="test.case" />
</fileset>
</batchtest>
</junit>
Modified: harmony/enhanced/classlib/trunk/modules/x-net/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/x-net/build.xml?view=diff&rev=521594&r1=521593&r2=521594
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/x-net/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/x-net/build.xml Thu Mar 22 22:33:20 2007
@@ -175,10 +175,13 @@
<pathelement path="../../build/tests" />
</classpath>
- <batchtest todir="${hy.tests.reports}" haltonfailure="no" unless="test.case">
+ <batchtest todir="${hy.tests.reports}" haltonfailure="no" >
<fileset dir="${hy.x-net.src.test}/api/java">
- <include name="**/*Test.java"/>
- <excludesfile name="${x-net.exclude.file}" />
+ <!-- if ${test.case} -->
+ <include name="${converted.tc}" if="test.case" />
+ <!-- unless ${test.case} -->
+ <include name="**/*Test.java" unless="test.case" />
+ <excludesfile name="${x-net.exclude.file}" unless="test.case" />
</fileset>
</batchtest>
@@ -197,10 +200,13 @@
<pathelement path="${hy.hdk}/build/test/support.jar" />
</classpath>
- <batchtest todir="${hy.tests.reports}" haltonfailure="no" unless="test.case">
+ <batchtest todir="${hy.tests.reports}" haltonfailure="no" >
<fileset dir="${hy.x-net.src.test}/impl/java">
- <include name="**/*Test.java"/>
- <excludesfile name="${x-net.exclude.file}" />
+ <!-- if ${test.case} -->
+ <include name="${converted.tc}" if="test.case" />
+ <!-- unless ${test.case} -->
+ <include name="**/*Test.java" unless="test.case" />
+ <excludesfile name="${x-net.exclude.file}" unless="test.case" />
</fileset>
</batchtest>
@@ -211,10 +217,13 @@
<!-- to pick up junit.jar -->
<jvmarg value="-Xbootclasspath/a:${hy.x-net.bin.test}/impl.injected${path.separator}../../${junit.jar}${path.separator}../../build/tests${path.separator}${hy.hdk}/build/test/support.jar"/>
- <batchtest todir="${hy.tests.reports}" haltonfailure="no" unless="test.case">
+ <batchtest todir="${hy.tests.reports}" haltonfailure="no" >
<fileset dir="${hy.x-net.src.test}/impl/java.injected">
- <include name="**/*Test.java"/>
- <excludesfile name="${x-net.exclude.file}" />
+ <!-- if ${test.case} -->
+ <include name="${converted.tc}" if="test.case" />
+ <!-- unless ${test.case} -->
+ <include name="**/*Test.java" unless="test.case" />
+ <excludesfile name="${x-net.exclude.file}" unless="test.case" />
</fileset>
</batchtest>
@@ -296,9 +305,6 @@
</classpath>
<formatter type="xml" />
-
- <test name="${test.case}" todir="${hy.tests.reports}" if="test.c
-ase" />
</junit>
</sequential>
</macrodef>