harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r433564 - in /incubator/harmony/enhanced/classlib/trunk/modules: accessibility/ annotation/ applet/ archive/ auth/ awt/ beans/ crypto/ instrument/ jndi/ lang-management/ logging/ luni/ math/ misc/ nio/ nio_char/ prefs/ regex/ rmi/ rmi2.1.4/...
Date Tue, 22 Aug 2006 08:53:13 GMT
Author: hindessm
Date: Tue Aug 22 01:53:12 2006
New Revision: 433564

URL: http://svn.apache.org/viewvc?rev=433564&view=rev
Log:
Run tests from modules/* not modules/*/bin/test as discussed on -dev list.

Modified:
    incubator/harmony/enhanced/classlib/trunk/modules/accessibility/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/annotation/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/applet/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/archive/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/auth/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/awt/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/beans/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/instrument/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/jndi/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/lang-management/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/logging/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/math/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/misc/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/nio/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/nio_char/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/prefs/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/regex/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/rmi2.1.4/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/security/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/sound/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/sql/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/suncompat/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/swing/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/text/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/tools/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/x-net/build.xml

Modified: incubator/harmony/enhanced/classlib/trunk/modules/accessibility/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/accessibility/build.xml?rev=433564&r1=433563&r2=433564&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/accessibility/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/accessibility/build.xml Tue Aug 22 01:53:12
2006
@@ -35,6 +35,8 @@
 	     use the Eclipse Java compiler. -->
     <property name="build.compiler" value="modern" />
 
+    <property file="../../make/depends.properties" />
+
     <target name="build" depends="compile.java, build.jar" />
 
     <target name="test" depends="build, compile.tests, run.tests" />
@@ -110,12 +112,12 @@
                errorproperty="test.errors"
                failureproperty="test.failures"
                showoutput="on"
-               dir="${hy.accessibility.bin.test}"
+               dir="${basedir}"
                jvm="${test.jre.home}/bin/java">
 
             <env key="JAVA_HOME" value="${test.jre.home}"/>
 
-            <jvmarg value="-Xbootclasspath/a:${hy.accessibility.bin.test}${path.separator}${basedir}/../../depends/jars/junit_3.8.2/junit.jar${path.separator}${hy.hdk}/build/test/support.jar"/>
+            <jvmarg value="-Xbootclasspath/a:${hy.accessibility.bin.test}${path.separator}../../${junit.jar}${path.separator}${hy.hdk}/build/test/support.jar"/>
 
             <formatter type="xml" />
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/annotation/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/annotation/build.xml?rev=433564&r1=433563&r2=433564&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/annotation/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/annotation/build.xml Tue Aug 22 01:53:12
2006
@@ -110,7 +110,7 @@
                errorproperty="test.errors"
                failureproperty="test.failures"
                showoutput="on"
-               dir="${hy.annotation.bin.test}"
+               dir="${basedir}"
                jvm="${test.jre.home}/bin/java">
 
             <jvmarg value="-showversion"/>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/applet/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/applet/build.xml?rev=433564&r1=433563&r2=433564&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/applet/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/applet/build.xml Tue Aug 22 01:53:12
2006
@@ -109,7 +109,7 @@
                errorproperty="test.errors"
                failureproperty="test.failures"
                showoutput="on"
-               dir="${hy.applet.bin.test}"
+               dir="${basedir}"
                jvm="${test.jre.home}/bin/java">
 
             <jvmarg value="-showversion"/>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/archive/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/archive/build.xml?rev=433564&r1=433563&r2=433564&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/archive/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/archive/build.xml Tue Aug 22 01:53:12
2006
@@ -169,7 +169,7 @@
                errorproperty="test.errors"
                failureproperty="test.failures"
                showoutput="on"
-               dir="${hy.archive.bin.test}"
+               dir="${basedir}"
                jvm="${test.jre.home}/bin/java">
 
             <jvmarg value="-showversion"/>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/build.xml?rev=433564&r1=433563&r2=433564&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/build.xml Tue Aug 22 01:53:12 2006
@@ -148,7 +148,7 @@
                errorproperty="test.errors"
                failureproperty="test.failures"
                showoutput="on"
-               dir="${hy.auth.bin.test}"
+               dir="${basedir}"
                jvm="${test.jre.home}/bin/java">
 
             <!--jvmarg value="-showversion"/-->
@@ -160,7 +160,7 @@
             <jvmarg value="-DRESOURCE_DIR=${hy.auth.src.test.java}"/>
 
             <!-- to pick up junit.jar -->
-            <jvmarg value="-Xbootclasspath/a:${hy.auth.bin.test}${path.separator}../../../../${junit.jar}${path.separator}${hy.hdk}/build/test/support.jar"/>
+            <jvmarg value="-Xbootclasspath/a:${hy.auth.bin.test}${path.separator}../../${junit.jar}${path.separator}${hy.hdk}/build/test/support.jar"/>
 
             <env key="JAVA_HOME" value="${test.jre.home}"/>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/build.xml?rev=433564&r1=433563&r2=433564&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/build.xml Tue Aug 22 01:53:12 2006
@@ -35,6 +35,8 @@
              use the Eclipse Java compiler. -->
     <property name="build.compiler" value="modern" />
 
+    <property file="../../make/depends.properties" />
+
     <property name="hy.awt.src.main.java.platform"
               value="${hy.awt.src.main.java}/../${hy.os}" />
 
@@ -234,11 +236,11 @@
                errorproperty="test.errors"
                failureproperty="test.failures"
                showoutput="on"
-               dir="${hy.awt.bin.test}"
+               dir="${basedir}"
                jvm="${test.jre.home}/bin/java">
 
             <jvmarg value="-DTEST_SRC_DIR=${hy.awt.bin.test}"/>
-            <jvmarg value="-Xbootclasspath/a:${hy.awt.bin.test}${path.separator}${basedir}/../../depends/jars/junit_3.8.2/junit.jar"/>
+            <jvmarg value="-Xbootclasspath/a:${hy.awt.bin.test}${path.separator}${basedir}/../../${junit.jar}"/>
             <env key="JAVA_HOME" value="${test.jre.home}"/>
 
             <formatter type="xml" />

Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/beans/build.xml?rev=433564&r1=433563&r2=433564&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/build.xml Tue Aug 22 01:53:12
2006
@@ -150,14 +150,14 @@
                errorproperty="test.errors"
                failureproperty="test.failures"
                showoutput="on"
-               dir="${hy.beans.bin.internal}"
+               dir="${basedir}"
                jvm="${test.jre.home}/bin/java">
 
             <jvmarg value="-showversion"/>
 
             <env key="JAVA_HOME" value="${test.jre.home}"/>
 
-    		<jvmarg value="-Xbootclasspath/a:${hy.beans.bin.internal}${path.separator}../../../../${junit.jar}"/>
   		
+    		<jvmarg value="-Xbootclasspath/a:${hy.beans.bin.internal}${path.separator}../../${junit.jar}"/>
   		
     		
             <classpath>
                 <pathelement path="${hy.beans.bin.test}"/>
@@ -188,7 +188,7 @@
                errorproperty="test.errors"
                failureproperty="test.failures"
                showoutput="on"
-               dir="${hy.beans.bin.test}"
+               dir="${basedir}"
                jvm="${test.jre.home}/bin/java">
 
             <jvmarg value="-showversion"/>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/crypto/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/crypto/build.xml?rev=433564&r1=433563&r2=433564&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/build.xml Tue Aug 22 01:53:12
2006
@@ -148,7 +148,7 @@
         <run-tests description="api.injected tests">
             <junit-elements>
                 <!-- 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"/>
+                <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">
                     <fileset dir="${hy.crypto.src.test}/api/java.injected">
@@ -183,7 +183,7 @@
         <run-tests description="impl injected tests">
             <junit-elements>
                 <!-- to pick up junit.jar               -->
-                <jvmarg value="-Xbootclasspath/a:${hy.crypto.bin.test}/impl.injected${path.separator}../../../../${junit.jar}${path.separator}../../../../build/tests"/>
+                <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">
                     <fileset dir="${hy.crypto.src.test}/impl/java.injected">
@@ -251,7 +251,7 @@
                    errorproperty="test.errors"
                    failureproperty="test.failures"
                    showoutput="on"
-                   dir="${hy.crypto.bin.test}"
+                   dir="${basedir}"
                    jvm="${test.jre.home}/bin/java">
 
                 <jvmarg value="-showversion"/>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/instrument/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/instrument/build.xml?rev=433564&r1=433563&r2=433564&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/instrument/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/instrument/build.xml Tue Aug 22 01:53:12
2006
@@ -138,7 +138,7 @@
             errorproperty="test.errors"
             failureproperty="test.failures"
             showoutput="on"
-            dir="${hy.instrument.bin.test}"
+            dir="${basedir}"
             jvm="${test.jre.home}/bin/java">
 
             <jvmarg value="-showversion"/>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/jndi/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/jndi/build.xml?rev=433564&r1=433563&r2=433564&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/jndi/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/jndi/build.xml Tue Aug 22 01:53:12 2006
@@ -109,7 +109,7 @@
                errorproperty="test.errors"
                failureproperty="test.failures"
                showoutput="on"
-               dir="${hy.jndi.bin.test}"
+               dir="${basedir}"
                jvm="${test.jre.home}/bin/java">
 
             <jvmarg value="-showversion"/>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/lang-management/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/lang-management/build.xml?rev=433564&r1=433563&r2=433564&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/lang-management/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/lang-management/build.xml Tue Aug 22
01:53:12 2006
@@ -110,7 +110,7 @@
                errorproperty="test.errors"
                failureproperty="test.failures"
                showoutput="on"
-               dir="${hy.lang-management.bin.test}"
+               dir="${basedir}"
                jvm="${test.jre.home}/bin/java">
 
             <jvmarg value="-showversion"/>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/logging/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/logging/build.xml?rev=433564&r1=433563&r2=433564&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/logging/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/logging/build.xml Tue Aug 22 01:53:12
2006
@@ -127,7 +127,7 @@
                errorproperty="test.errors"
                failureproperty="test.failures"
                showoutput="on"
-               dir="${hy.logging.bin.test}"
+               dir="${basedir}"
                jvm="${test.jre.home}/bin/java">
 
             <jvmarg value="-showversion"/>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml?rev=433564&r1=433563&r2=433564&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml Tue Aug 22 01:53:12 2006
@@ -300,10 +300,10 @@
                     <pathelement path="${hy.hdk}/build/test/support.jar" />
                 </classpath>
                 <!-- Required by various tests that set security manager etc -->
-                <jvmarg value="-Djava.security.policy=../../../../support/src/test/resources/config/testing.policy"
/>
+                <jvmarg value="-Djava.security.policy=../../support/src/test/resources/config/testing.policy"
/>
 
                 <!-- Required for running the java.net unit tests -->
-                <jvmarg value="-Dtest.ini.file=../../../../support/src/test/resources/config/localhosttest.ini"
/>
+                <jvmarg value="-Dtest.ini.file=../..support/src/test/resources/config/localhosttest.ini"
/>
 
 
                 <batchtest todir="${hy.tests.reports}" haltonfailure="no" unless="test.case">
@@ -393,7 +393,7 @@
                    errorproperty="test.errors"
                    failureproperty="test.failures"
                    showoutput="on"
-                   dir="${hy.luni.bin.test}"
+                   dir="${basedir}"
                    jvm="${test.jre.home}/bin/java">
 
                 <jvmarg value="-showversion" />

Modified: incubator/harmony/enhanced/classlib/trunk/modules/math/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/math/build.xml?rev=433564&r1=433563&r2=433564&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/math/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/math/build.xml Tue Aug 22 01:53:12 2006
@@ -109,7 +109,7 @@
             errorproperty="test.errors"
             failureproperty="test.failures"
             showoutput="on"
-            dir="${hy.math.bin.test}"
+            dir="${basedir}"
             jvm="${test.jre.home}/bin/java">
 
             <jvmarg value="-showversion"/>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/misc/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/misc/build.xml?rev=433564&r1=433563&r2=433564&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/misc/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/misc/build.xml Tue Aug 22 01:53:12 2006
@@ -126,7 +126,7 @@
                errorproperty="test.errors"
                failureproperty="test.failures"
                showoutput="on"
-               dir="${hy.misc.bin.test}"
+               dir="${basedir}"
                jvm="${test.jre.home}/bin/java">
 
             <jvmarg value="-showversion"/>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/nio/build.xml?rev=433564&r1=433563&r2=433564&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio/build.xml Tue Aug 22 01:53:12 2006
@@ -135,7 +135,7 @@
 			errorproperty="test.errors"
 			failureproperty="test.failures"
 			showoutput="on"
-			dir="${hy.nio.bin.test}"
+			dir="${basedir}"
 			jvm="${test.jre.home}/bin/java">
 
 			<jvmarg value="-showversion" />

Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio_char/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/nio_char/build.xml?rev=433564&r1=433563&r2=433564&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio_char/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio_char/build.xml Tue Aug 22 01:53:12
2006
@@ -110,7 +110,7 @@
                errorproperty="test.errors"
                failureproperty="test.failures"
                showoutput="on"
-               dir="${hy.nio_char.bin.test}"
+               dir="${basedir}"
                jvm="${test.jre.home}/bin/java">
 
             <jvmarg value="-showversion"/>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/prefs/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/prefs/build.xml?rev=433564&r1=433563&r2=433564&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/prefs/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/prefs/build.xml Tue Aug 22 01:53:12
2006
@@ -130,7 +130,7 @@
             errorproperty="test.errors"
             failureproperty="test.failures"
             showoutput="on"
-            dir="${hy.prefs.bin.test}"
+            dir="${basedir}"
             jvm="${test.jre.home}/bin/java">
 
             <jvmarg value="-showversion"/>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/regex/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/regex/build.xml?rev=433564&r1=433563&r2=433564&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/regex/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/regex/build.xml Tue Aug 22 01:53:12
2006
@@ -109,7 +109,7 @@
                errorproperty="test.errors"
                failureproperty="test.failures"
                showoutput="on"
-               dir="${hy.regex.bin.test}"
+               dir="${basedir}"
                jvm="${test.jre.home}/bin/java">
 
             <jvmarg value="-showversion"/>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/rmi/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/rmi/build.xml?rev=433564&r1=433563&r2=433564&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/rmi/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/rmi/build.xml Tue Aug 22 01:53:12 2006
@@ -174,11 +174,11 @@
                    errorproperty="test.errors"
                    failureproperty="test.failures"
                    showoutput="on"
-                   dir="${hy.rmi.bin.test}"
+                   dir="${basedir}"
                    jvm="${test.jre.home}/bin/java">
 
                 <jvmarg value="-showversion"/>
-                <jvmarg value="-Djava.security.policy=../../make/all.policy"/>
+                <jvmarg value="-Djava.security.policy=make/all.policy"/>
 
                 <env key="JAVA_HOME" value="${test.jre.home}"/>
                 <junit-elements />

Modified: incubator/harmony/enhanced/classlib/trunk/modules/rmi2.1.4/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/rmi2.1.4/build.xml?rev=433564&r1=433563&r2=433564&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/rmi2.1.4/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/rmi2.1.4/build.xml Tue Aug 22 01:53:12
2006
@@ -106,7 +106,7 @@
                errorproperty="test.errors"
                failureproperty="test.failures"
                showoutput="on"
-               dir="${hy.rmi.bin.test}"
+               dir="${basedir}"
                jvm="${test.jre.home}/bin/java">
 
             <jvmarg value="-showversion"/>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/build.xml?rev=433564&r1=433563&r2=433564&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/build.xml Tue Aug 22 01:53:12
2006
@@ -201,7 +201,7 @@
                 <jvmarg value="-DRESOURCE_DIR=${hy.security.src.test}/resources"/>
 
                 <!-- to pick up junit.jar               -->
-                <jvmarg value="-Xbootclasspath/a:${hy.security.bin.test}/api.injected${path.separator}../../../../${junit.jar}${path.separator}../../../../build/tests${path.separator}${hy.hdk}/build/test/support.jar"/>
+                <jvmarg value="-Xbootclasspath/a:${hy.security.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">
                     <fileset dir="${hy.security.src.test}/api/java.injected">
@@ -249,7 +249,7 @@
                 <jvmarg value="-DRESOURCE_DIR=${hy.security.src.test}/resources"/>
 
                 <!-- to pick up junit.jar               -->
-                <jvmarg value="-Xbootclasspath/a:${hy.security.bin.test}/impl.injected${path.separator}../../../../${junit.jar}${path.separator}../../../../build/tests"/>
+                <jvmarg value="-Xbootclasspath/a:${hy.security.bin.test}/impl.injected${path.separator}../../${junit.jar}${path.separator}../../build/tests"/>
 
                 <batchtest todir="${hy.tests.reports}" haltonfailure="no" unless="test.case">
                     <fileset dir="${hy.security.src.test}/impl/java.injected">
@@ -320,7 +320,7 @@
                    errorproperty="test.errors"
                    failureproperty="test.failures"
                    showoutput="on"
-                   dir="${hy.security.bin.test}"
+                   dir="${basedir}"
                    jvm="${test.jre.home}/bin/java">
 
                 <jvmarg value="-showversion" />

Modified: incubator/harmony/enhanced/classlib/trunk/modules/sound/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/sound/build.xml?rev=433564&r1=433563&r2=433564&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/sound/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/sound/build.xml Tue Aug 22 01:53:12
2006
@@ -110,7 +110,7 @@
                errorproperty="test.errors"
                failureproperty="test.failures"
                showoutput="on"
-               dir="${hy.sound.bin.test}"
+               dir="${basedir}"
                jvm="${test.jre.home}/bin/java">
 
             <jvmarg value="-showversion"/>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/sql/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/sql/build.xml?rev=433564&r1=433563&r2=433564&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/sql/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/sql/build.xml Tue Aug 22 01:53:12 2006
@@ -116,7 +116,7 @@
                errorproperty="test.errors"
                failureproperty="test.failures"
                showoutput="on"
-               dir="${hy.sql.bin.test}"
+               dir="${basedir}"
                jvm="${test.jre.home}/bin/java">
 
             <jvmarg value="-showversion"/>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/suncompat/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/suncompat/build.xml?rev=433564&r1=433563&r2=433564&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/suncompat/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/suncompat/build.xml Tue Aug 22 01:53:12
2006
@@ -116,7 +116,7 @@
                errorproperty="test.errors"
                failureproperty="test.failures"
                showoutput="on"
-               dir="${hy.suncompat.bin.test}"
+               dir="${basedir}"
                jvm="${test.jre.home}/bin/java">
 
             <jvmarg value="-showversion"/>
@@ -155,4 +155,4 @@
             append="true">suncompat${line.separator}</echo>
     </target>
 
-</project>
\ No newline at end of file
+</project>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/swing/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/swing/build.xml?rev=433564&r1=433563&r2=433564&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/swing/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/swing/build.xml Tue Aug 22 01:53:12
2006
@@ -35,6 +35,8 @@
 	     use the Eclipse Java compiler. -->
     <property name="build.compiler" value="modern" />
 
+    <property file="../../make/depends.properties" />
+
     <property name="hy.swing.src.main.java.platform"
               value="${hy.swing.src.main.java}/../${hy.os}" />
 
@@ -121,7 +123,7 @@
                errorproperty="test.errors"
                failureproperty="test.failures"
                showoutput="on"
-               dir="${hy.swing.bin.test}"
+               dir="${basedir}"
                jvm="${test.jre.home}/bin/java">
 
             <env key="JAVA_HOME" value="${test.jre.home}"/>
@@ -130,7 +132,7 @@
 
             <test name="${test.case}" todir="${hy.tests.reports}"
                   if="test.case" />
-            <jvmarg value="-Xbootclasspath/a:${hy.swing.bin.test}${path.separator}${basedir}/../../depends/jars/junit_3.8.2/junit.jar${path.separator}${hy.hdk}/build/test/support.jar"/>
+            <jvmarg value="-Xbootclasspath/a:${hy.swing.bin.test}${path.separator}../../${junit.jar}${path.separator}${hy.hdk}/build/test/support.jar"/>
 
             <batchtest todir="${hy.tests.reports}" haltonfailure="no"
                 unless="test.case">

Modified: incubator/harmony/enhanced/classlib/trunk/modules/text/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/text/build.xml?rev=433564&r1=433563&r2=433564&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/text/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/text/build.xml Tue Aug 22 01:53:12 2006
@@ -138,13 +138,13 @@
         <property name="test.jre.home" value="${hy.jdk}/jre" />
 
         <junit fork="yes"
-            forkmode="once"
-            printsummary="withOutAndErr"
-            errorproperty="test.errors"
-            failureproperty="test.failures"
-            showoutput="on"
-            dir="${hy.text.bin.test}"
-            jvm="${test.jre.home}/bin/java">
+               forkmode="once"
+               printsummary="withOutAndErr"
+               errorproperty="test.errors"
+               failureproperty="test.failures"
+               showoutput="on"
+               dir="${basedir}"
+               jvm="${test.jre.home}/bin/java">
 
             <jvmarg value="-showversion"/>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/tools/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/tools/build.xml?rev=433564&r1=433563&r2=433564&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/tools/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/tools/build.xml Tue Aug 22 01:53:12
2006
@@ -113,13 +113,13 @@
 		<property name="test.jre.home" value="${hy.jdk}/jre" />
 
 		<junit fork="yes"
-               forkmode="once"
-               printsummary="withOutAndErr"
-               errorproperty="test.errors"
-               failureproperty="test.failures"
-               showoutput="on"
-               dir="${hy.tools.bin.test}"
-               jvm="${test.jre.home}/bin/java">
+                       forkmode="once"
+                       printsummary="withOutAndErr"
+                       errorproperty="test.errors"
+                       failureproperty="test.failures"
+                       showoutput="on"
+                       dir="${basedir}"
+                       jvm="${test.jre.home}/bin/java">
 
 			<jvmarg value="-showversion"/>
 
@@ -133,10 +133,10 @@
 			<formatter type="xml" />
 
 			<test name="${test.case}" todir="${hy.tests.reports}"
-                 if="test.case" />
+                              if="test.case" />
 
 			<batchtest todir="${hy.tests.reports}" haltonfailure="no"
-                unless="test.case">
+                                   unless="test.case">
 
 				<fileset dir="${hy.tools.src.test.java}">
 					<include name="**/*Test.java"/>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/x-net/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/x-net/build.xml?rev=433564&r1=433563&r2=433564&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/x-net/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/x-net/build.xml Tue Aug 22 01:53:12
2006
@@ -159,7 +159,7 @@
         <run-tests description="impl injected tests">
             <junit-elements>
                 <!-- to pick up junit.jar               -->
-                <jvmarg value="-Xbootclasspath/a:${hy.x-net.bin.test}/impl.injected${path.separator}../../../../${junit.jar}${path.separator}../../../../build/tests"/>
+                <jvmarg value="-Xbootclasspath/a:${hy.x-net.bin.test}/impl.injected${path.separator}../../${junit.jar}${path.separator}../../build/tests"/>
 
                 <batchtest todir="${hy.tests.reports}" haltonfailure="no" unless="test.case">
                     <fileset dir="${hy.x-net.src.test}/impl/java.injected">
@@ -227,7 +227,7 @@
                    errorproperty="test.errors"
                    failureproperty="test.failures"
                    showoutput="on"
-                   dir="${hy.x-net.bin.test}"
+                   dir="${basedir}"
                    jvm="${test.jre.home}/bin/java">
 
                 <jvmarg value="-showversion"/>



Mime
View raw message