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 2006/04/12 09:52:11 UTC
svn commit: r393409 - in /incubator/harmony/enhanced/classlib/trunk: make/
modules/applet/make/common/ modules/archive/make/common/
modules/auth/make/common/ modules/awt/make/common/
modules/beans/make/common/ modules/crypto/make/common/ modules/jndi/m...
Author: smishura
Date: Wed Apr 12 00:52:07 2006
New Revision: 393409
URL: http://svn.apache.org/viewcvs?rev=393409&view=rev
Log:
Apply patch HARMONY-331 (test failures in modules should be propogated back up to top level test target)
Modified:
incubator/harmony/enhanced/classlib/trunk/make/build-test.xml
incubator/harmony/enhanced/classlib/trunk/modules/applet/make/common/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/archive/make/common/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/auth/make/common/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/awt/make/common/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/beans/make/common/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/common/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/jndi/make/common/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/logging/make/common/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/luni/make/common/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/math/make/common/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/nio/make/common/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/nio_char/make/common/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/prefs/make/common/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/rmi/make/common/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/security/make/common/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/sql/make/common/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/text/make/common/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/x-net/make/common/build.xml
Modified: incubator/harmony/enhanced/classlib/trunk/make/build-test.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/make/build-test.xml?rev=393409&r1=393408&r2=393409&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/make/build-test.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/make/build-test.xml Wed Apr 12 00:52:07 2006
@@ -33,7 +33,7 @@
<!-- this list of components to test will grow to eventually be all modules -->
<target name="test-all"
- depends="clean, test-security, test-luni, test-archive, test-text, test-nio, test-xnet, test-nio_char, test-logging, test-jndi, test-sql, test-prefs, test-beans, test-math, test-crypto, test-auth, gen-report">
+ depends="clean, test-security, test-luni, test-archive, test-text, test-nio, test-xnet, test-nio_char, test-logging, test-jndi, test-sql, test-prefs, test-beans, test-math, test-crypto, test-auth, gen-report, check-test-result">
</target>
<target name="clean">
@@ -195,6 +195,15 @@
</target>
+ <target name="check-test-result">
+ <available property="test.errors"
+ file="${tests.output}/test.errors" />
+ <available property="test.failures"
+ file="${tests.output}/test.failures" />
+ <fail if="test.errors" message="There were test errors." />
+ <fail if="test.failures" message="There were test failures." />
+ </target>
+
<!-- =================================
target: copy-test-resources
================================= -->
Modified: incubator/harmony/enhanced/classlib/trunk/modules/applet/make/common/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/applet/make/common/build.xml?rev=393409&r1=393408&r2=393409&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/applet/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/applet/make/common/build.xml Wed Apr 12 00:52:07 2006
@@ -72,7 +72,8 @@
<junit fork="yes"
forkmode="once"
printsummary="withOutAndErr"
- errorproperty="test.error"
+ errorproperty="test.errors"
+ failureproperty="test.failures"
showoutput="on"
dir="${hy.applet.bin.test}"
jvm="${hy.target}/jre/bin/java">
@@ -91,8 +92,20 @@
<fileset dir="${hy.applet.src.test.java}"/>
</batchtest>
</junit>
+ <antcall target="touch-failures-file" />
+ <antcall target="touch-errors-file" />
</target>
+ <target name="touch-failures-file" if="test.failures">
+ <echo file="${hy.tests.reports}/test.failures"
+ append="true" >applet
+ </echo>
+ </target>
+ <target name="touch-errors-file" if="test.errors">
+ <echo file="${hy.tests.reports}/test.errors"
+ append="true" >applet
+ </echo>
+ </target>
<target name="copy.resources">
<!-- Nothing for APPLET -->
Modified: incubator/harmony/enhanced/classlib/trunk/modules/archive/make/common/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/archive/make/common/build.xml?rev=393409&r1=393408&r2=393409&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/archive/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/archive/make/common/build.xml Wed Apr 12 00:52:07 2006
@@ -72,7 +72,8 @@
<junit fork="yes"
forkmode="once"
printsummary="withOutAndErr"
- errorproperty="test.error"
+ errorproperty="test.errors"
+ failureproperty="test.failures"
showoutput="on"
dir="${hy.archive.bin.test}"
jvm="${hy.target}/jre/bin/java">
@@ -100,8 +101,20 @@
</fileset>
</batchtest>
</junit>
+ <antcall target="touch-failures-file" />
+ <antcall target="touch-errors-file" />
</target>
+ <target name="touch-failures-file" if="test.failures">
+ <echo file="${hy.tests.reports}/test.failures"
+ append="true" >archive
+ </echo>
+ </target>
+ <target name="touch-errors-file" if="test.errors">
+ <echo file="${hy.tests.reports}/test.errors"
+ append="true" >archive
+ </echo>
+ </target>
<target name="copy.resources">
<!-- Nothing for ARCHIVE -->
Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/make/common/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/auth/make/common/build.xml?rev=393409&r1=393408&r2=393409&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/make/common/build.xml Wed Apr 12 00:52:07 2006
@@ -94,7 +94,8 @@
<junit fork="yes"
forkmode="once"
printsummary="withOutAndErr"
- errorproperty="test.error"
+ errorproperty="test.errors"
+ failureproperty="test.failures"
showoutput="on"
dir="${hy.auth.bin.test}"
jvm="${hy.target}/jre/bin/java">
@@ -137,8 +138,20 @@
</fileset>
</batchtest>
</junit>
+ <antcall target="touch-failures-file" />
+ <antcall target="touch-errors-file" />
</target>
+ <target name="touch-failures-file" if="test.failures">
+ <echo file="${hy.tests.reports}/test.failures"
+ append="true" >auth
+ </echo>
+ </target>
+ <target name="touch-errors-file" if="test.errors">
+ <echo file="${hy.tests.reports}/test.errors"
+ append="true" >auth
+ </echo>
+ </target>
<target name="copy.resources">
<!-- Nothing for AUTH -->
Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/make/common/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/awt/make/common/build.xml?rev=393409&r1=393408&r2=393409&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/make/common/build.xml Wed Apr 12 00:52:07 2006
@@ -72,7 +72,8 @@
<junit fork="yes"
forkmode="once"
printsummary="withOutAndErr"
- errorproperty="test.error"
+ errorproperty="test.errors"
+ failureproperty="test.failures"
showoutput="on"
dir="${hy.awt.bin.test}"
jvm="${hy.target}/jre/bin/java">
@@ -91,8 +92,20 @@
<fileset dir="${hy.awt.src.test.java}"/>
</batchtest>
</junit>
+ <antcall target="touch-failures-file" />
+ <antcall target="touch-errors-file" />
</target>
+ <target name="touch-failures-file" if="test.failures">
+ <echo file="${hy.tests.reports}/test.failures"
+ append="true" >awt
+ </echo>
+ </target>
+ <target name="touch-errors-file" if="test.errors">
+ <echo file="${hy.tests.reports}/test.errors"
+ append="true" >awt
+ </echo>
+ </target>
<target name="copy.resources">
<!-- Nothing for AWT -->
Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/make/common/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/beans/make/common/build.xml?rev=393409&r1=393408&r2=393409&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/make/common/build.xml Wed Apr 12 00:52:07 2006
@@ -72,7 +72,8 @@
<junit fork="yes"
forkmode="once"
printsummary="withOutAndErr"
- errorproperty="test.error"
+ errorproperty="test.errors"
+ failureproperty="test.failures"
showoutput="on"
dir="${hy.beans.bin.test}"
jvm="${hy.target}/jre/bin/java">
@@ -104,8 +105,20 @@
</fileset>
</batchtest>
</junit>
+ <antcall target="touch-failures-file" />
+ <antcall target="touch-errors-file" />
</target>
+ <target name="touch-failures-file" if="test.failures">
+ <echo file="${hy.tests.reports}/test.failures"
+ append="true" >beans
+ </echo>
+ </target>
+ <target name="touch-errors-file" if="test.errors">
+ <echo file="${hy.tests.reports}/test.errors"
+ append="true" >beans
+ </echo>
+ </target>
<target name="copy.resources">
<!-- Nothing for BEANS -->
Modified: incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/common/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/common/build.xml?rev=393409&r1=393408&r2=393409&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/common/build.xml Wed Apr 12 00:52:07 2006
@@ -84,7 +84,8 @@
<junit fork="yes"
forkmode="once"
printsummary="withOutAndErr"
- errorproperty="test.error"
+ errorproperty="test.errors"
+ failureproperty="test.failures"
showoutput="on"
dir="${hy.crypto.bin.test}"
jvm="${hy.target}/jre/bin/java">
@@ -115,9 +116,20 @@
</fileset>
</batchtest>
</junit>
+ <antcall target="touch-failures-file" />
+ <antcall target="touch-errors-file" />
+ </target>
+
+ <target name="touch-failures-file" if="test.failures">
+ <echo file="${hy.tests.reports}/test.failures"
+ append="true" >crypto
+ </echo>
+ </target>
+ <target name="touch-errors-file" if="test.errors">
+ <echo file="${hy.tests.reports}/test.errors"
+ append="true" >crypto
+ </echo>
</target>
-
-
<target name="copy.resources">
<!-- Nothing for CRYPTO -->
Modified: incubator/harmony/enhanced/classlib/trunk/modules/jndi/make/common/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/jndi/make/common/build.xml?rev=393409&r1=393408&r2=393409&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/jndi/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/jndi/make/common/build.xml Wed Apr 12 00:52:07 2006
@@ -72,7 +72,8 @@
<junit fork="yes"
forkmode="once"
printsummary="withOutAndErr"
- errorproperty="test.error"
+ errorproperty="test.errors"
+ failureproperty="test.failures"
showoutput="on"
dir="${hy.jndi.bin.test}"
jvm="${hy.target}/jre/bin/java">
@@ -112,8 +113,20 @@
</fileset>
</batchtest>
</junit>
+ <antcall target="touch-failures-file" />
+ <antcall target="touch-errors-file" />
</target>
+ <target name="touch-failures-file" if="test.failures">
+ <echo file="${hy.tests.reports}/test.failures"
+ append="true" >jndi
+ </echo>
+ </target>
+ <target name="touch-errors-file" if="test.errors">
+ <echo file="${hy.tests.reports}/test.errors"
+ append="true" >jndi
+ </echo>
+ </target>
<target name="copy.resources">
<!-- Nothing for JNDI -->
Modified: incubator/harmony/enhanced/classlib/trunk/modules/logging/make/common/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/logging/make/common/build.xml?rev=393409&r1=393408&r2=393409&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/logging/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/logging/make/common/build.xml Wed Apr 12 00:52:07 2006
@@ -87,7 +87,8 @@
<junit fork="yes"
forkmode="once"
printsummary="withOutAndErr"
- errorproperty="test.error"
+ errorproperty="test.errors"
+ failureproperty="test.failures"
showoutput="on"
dir="${hy.logging.bin.test}"
jvm="${hy.target}/jre/bin/java">
@@ -125,8 +126,20 @@
</fileset>
</batchtest>
</junit>
+ <antcall target="touch-failures-file" />
+ <antcall target="touch-errors-file" />
</target>
+ <target name="touch-failures-file" if="test.failures">
+ <echo file="${hy.tests.reports}/test.failures"
+ append="true" >logging
+ </echo>
+ </target>
+ <target name="touch-errors-file" if="test.errors">
+ <echo file="${hy.tests.reports}/test.errors"
+ append="true" >logging
+ </echo>
+ </target>
<target name="copy.resources">
<copy todir="${hy.target}/jre/lib" overwrite="yes" flatten="yes">
Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/make/common/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/make/common/build.xml?rev=393409&r1=393408&r2=393409&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/make/common/build.xml Wed Apr 12 00:52:07 2006
@@ -60,7 +60,14 @@
<mkdir dir="${hy.tests.reports}" />
- <junit fork="yes" forkmode="once" printsummary="withOutAndErr" errorproperty="test.error" showoutput="on" dir="${hy.luni.bin.test}" jvm="${hy.target}/jre/bin/java">
+ <junit fork="yes"
+ forkmode="once"
+ printsummary="withOutAndErr"
+ errorproperty="test.errors"
+ failureproperty="test.failures"
+ showoutput="on"
+ dir="${hy.luni.bin.test}"
+ jvm="${hy.target}/jre/bin/java">
<jvmarg value="-showversion" />
@@ -143,8 +150,20 @@
</fileset>
</batchtest>
</junit>
+ <antcall target="touch-failures-file" />
+ <antcall target="touch-errors-file" />
+ </target>
+
+ <target name="touch-failures-file" if="test.failures">
+ <echo file="${hy.tests.reports}/test.failures"
+ append="true" >luni
+ </echo>
+ </target>
+ <target name="touch-errors-file" if="test.errors">
+ <echo file="${hy.tests.reports}/test.errors"
+ append="true" >luni
+ </echo>
</target>
-
<target name="copy.resources">
<!-- Nothing for LUNI -->
Modified: incubator/harmony/enhanced/classlib/trunk/modules/math/make/common/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/math/make/common/build.xml?rev=393409&r1=393408&r2=393409&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/math/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/math/make/common/build.xml Wed Apr 12 00:52:07 2006
@@ -72,7 +72,8 @@
<junit fork="yes"
forkmode="once"
printsummary="withOutAndErr"
- errorproperty="test.error"
+ errorproperty="test.errors"
+ failureproperty="test.failures"
showoutput="on"
dir="${hy.math.bin.test}"
jvm="${hy.target}/jre/bin/java">
@@ -98,8 +99,20 @@
</fileset>
</batchtest>
</junit>
+ <antcall target="touch-failures-file" />
+ <antcall target="touch-errors-file" />
</target>
+ <target name="touch-failures-file" if="test.failures">
+ <echo file="${hy.tests.reports}/test.failures"
+ append="true" >math
+ </echo>
+ </target>
+ <target name="touch-errors-file" if="test.errors">
+ <echo file="${hy.tests.reports}/test.errors"
+ append="true" >math
+ </echo>
+ </target>
<target name="copy.resources">
<!-- Nothing for MATH -->
Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio/make/common/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio/make/common/build.xml?rev=393409&r1=393408&r2=393409&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio/make/common/build.xml Wed Apr 12 00:52:07 2006
@@ -72,7 +72,8 @@
<junit fork="yes"
forkmode="once"
printsummary="withOutAndErr"
- errorproperty="test.error"
+ errorproperty="test.errors"
+ failureproperty="test.failures"
showoutput="on"
dir="${hy.nio.bin.test}"
jvm="${hy.target}/jre/bin/java">
@@ -95,8 +96,20 @@
</fileset>
</batchtest>
</junit>
+ <antcall target="touch-failures-file" />
+ <antcall target="touch-errors-file" />
</target>
+ <target name="touch-failures-file" if="test.failures">
+ <echo file="${hy.tests.reports}/test.failures"
+ append="true" >nio
+ </echo>
+ </target>
+ <target name="touch-errors-file" if="test.errors">
+ <echo file="${hy.tests.reports}/test.errors"
+ append="true" >nio
+ </echo>
+ </target>
<target name="copy.resources">
<!-- Nothing for NIO -->
Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio_char/make/common/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio_char/make/common/build.xml?rev=393409&r1=393408&r2=393409&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio_char/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio_char/make/common/build.xml Wed Apr 12 00:52:07 2006
@@ -72,7 +72,8 @@
<junit fork="yes"
forkmode="once"
printsummary="withOutAndErr"
- errorproperty="test.error"
+ errorproperty="test.errors"
+ failureproperty="test.failures"
showoutput="on"
dir="${hy.nio_char.bin.test}"
jvm="${hy.target}/jre/bin/java">
@@ -118,8 +119,20 @@
</fileset>
</batchtest>
</junit>
+ <antcall target="touch-failures-file" />
+ <antcall target="touch-errors-file" />
</target>
+ <target name="touch-failures-file" if="test.failures">
+ <echo file="${hy.tests.reports}/test.failures"
+ append="true" >nio_char
+ </echo>
+ </target>
+ <target name="touch-errors-file" if="test.errors">
+ <echo file="${hy.tests.reports}/test.errors"
+ append="true" >nio_char
+ </echo>
+ </target>
<target name="copy.resources">
<!-- Nothing for NIO_CHAR -->
Modified: incubator/harmony/enhanced/classlib/trunk/modules/prefs/make/common/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/prefs/make/common/build.xml?rev=393409&r1=393408&r2=393409&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/prefs/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/prefs/make/common/build.xml Wed Apr 12 00:52:07 2006
@@ -72,7 +72,8 @@
<junit fork="yes"
forkmode="once"
printsummary="withOutAndErr"
- errorproperty="test.error"
+ errorproperty="test.errors"
+ failureproperty="test.failures"
showoutput="on"
dir="${hy.prefs.bin.test}"
jvm="${hy.target}/jre/bin/java">
@@ -97,8 +98,20 @@
</fileset>
</batchtest>
</junit>
+ <antcall target="touch-failures-file" />
+ <antcall target="touch-errors-file" />
</target>
+ <target name="touch-failures-file" if="test.failures">
+ <echo file="${hy.tests.reports}/test.failures"
+ append="true" >prefs
+ </echo>
+ </target>
+ <target name="touch-errors-file" if="test.errors">
+ <echo file="${hy.tests.reports}/test.errors"
+ append="true" >prefs
+ </echo>
+ </target>
<target name="copy.resources">
<!-- Nothing for PREFS -->
Modified: incubator/harmony/enhanced/classlib/trunk/modules/rmi/make/common/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/rmi/make/common/build.xml?rev=393409&r1=393408&r2=393409&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/rmi/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/rmi/make/common/build.xml Wed Apr 12 00:52:07 2006
@@ -72,7 +72,8 @@
<junit fork="yes"
forkmode="once"
printsummary="withOutAndErr"
- errorproperty="test.error"
+ errorproperty="test.errors"
+ failureproperty="test.failures"
showoutput="on"
dir="${hy.rmi.bin.test}"
jvm="${hy.target}/jre/bin/java">
@@ -91,8 +92,20 @@
<fileset dir="${hy.rmi.src.test.java}"/>
</batchtest>
</junit>
+ <antcall target="touch-failures-file" />
+ <antcall target="touch-errors-file" />
</target>
+ <target name="touch-failures-file" if="test.failures">
+ <echo file="${hy.tests.reports}/test.failures"
+ append="true" >rmi
+ </echo>
+ </target>
+ <target name="touch-errors-file" if="test.errors">
+ <echo file="${hy.tests.reports}/test.errors"
+ append="true" >rmi
+ </echo>
+ </target>
<target name="copy.resources">
<!-- Nothing for RMI -->
Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/make/common/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security/make/common/build.xml?rev=393409&r1=393408&r2=393409&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/make/common/build.xml Wed Apr 12 00:52:07 2006
@@ -73,7 +73,8 @@
<junit fork="yes"
forkmode="perTest"
printsummary="withOutAndErr"
- errorproperty="test.error"
+ errorproperty="test.errors"
+ failureproperty="test.failures"
showoutput="on"
dir="${hy.security.bin.test}"
jvm="${hy.target}/jre/bin/java">
@@ -123,8 +124,20 @@
</fileset>
</batchtest>
</junit>
+ <antcall target="touch-failures-file" />
+ <antcall target="touch-errors-file" />
</target>
+ <target name="touch-failures-file" if="test.failures">
+ <echo file="${hy.tests.reports}/test.failures"
+ append="true" >security
+ </echo>
+ </target>
+ <target name="touch-errors-file" if="test.errors">
+ <echo file="${hy.tests.reports}/test.errors"
+ append="true" >security
+ </echo>
+ </target>
<target name="copy.resources">
<!-- Nothing for SECURITY -->
Modified: incubator/harmony/enhanced/classlib/trunk/modules/sql/make/common/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/sql/make/common/build.xml?rev=393409&r1=393408&r2=393409&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/sql/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/sql/make/common/build.xml Wed Apr 12 00:52:07 2006
@@ -72,7 +72,8 @@
<junit fork="yes"
forkmode="once"
printsummary="withOutAndErr"
- errorproperty="test.error"
+ errorproperty="test.errors"
+ failureproperty="test.failures"
showoutput="on"
dir="${hy.sql.bin.test}"
jvm="${hy.target}/jre/bin/java">
@@ -96,8 +97,20 @@
</fileset>
</batchtest>
</junit>
+ <antcall target="touch-failures-file" />
+ <antcall target="touch-errors-file" />
</target>
+ <target name="touch-failures-file" if="test.failures">
+ <echo file="${hy.tests.reports}/test.failures"
+ append="true" >sql
+ </echo>
+ </target>
+ <target name="touch-errors-file" if="test.errors">
+ <echo file="${hy.tests.reports}/test.errors"
+ append="true" >sql
+ </echo>
+ </target>
<target name="copy.resources">
<!-- Nothing for SQL -->
Modified: incubator/harmony/enhanced/classlib/trunk/modules/text/make/common/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/text/make/common/build.xml?rev=393409&r1=393408&r2=393409&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/text/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/text/make/common/build.xml Wed Apr 12 00:52:07 2006
@@ -72,7 +72,8 @@
<junit fork="yes"
forkmode="once"
printsummary="withOutAndErr"
- errorproperty="test.error"
+ errorproperty="test.errors"
+ failureproperty="test.failures"
showoutput="on"
dir="${hy.text.bin.test}"
jvm="${hy.target}/jre/bin/java">
@@ -102,8 +103,20 @@
</fileset>
</batchtest>
</junit>
+ <antcall target="touch-failures-file" />
+ <antcall target="touch-errors-file" />
</target>
+ <target name="touch-failures-file" if="test.failures">
+ <echo file="${hy.tests.reports}/test.failures"
+ append="true" >text
+ </echo>
+ </target>
+ <target name="touch-errors-file" if="test.errors">
+ <echo file="${hy.tests.reports}/test.errors"
+ append="true" >text
+ </echo>
+ </target>
<target name="copy.resources">
<!-- Nothing for TEXT -->
Modified: incubator/harmony/enhanced/classlib/trunk/modules/x-net/make/common/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/x-net/make/common/build.xml?rev=393409&r1=393408&r2=393409&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/x-net/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/x-net/make/common/build.xml Wed Apr 12 00:52:07 2006
@@ -79,7 +79,8 @@
<junit fork="yes"
forkmode="once"
printsummary="withOutAndErr"
- errorproperty="test.error"
+ errorproperty="test.errors"
+ failureproperty="test.failures"
showoutput="on"
dir="${hy.x-net.bin.test}"
jvm="${hy.target}/jre/bin/java">
@@ -115,8 +116,20 @@
</fileset>
</batchtest>
</junit>
+ <antcall target="touch-failures-file" />
+ <antcall target="touch-errors-file" />
</target>
+ <target name="touch-failures-file" if="test.failures">
+ <echo file="${hy.tests.reports}/test.failures"
+ append="true" >x-net
+ </echo>
+ </target>
+ <target name="touch-errors-file" if="test.errors">
+ <echo file="${hy.tests.reports}/test.errors"
+ append="true" >x-net
+ </echo>
+ </target>
<target name="copy.resources">
<!-- Nothing for X-NET -->