harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smish...@apache.org
Subject svn commit: r394882 - in /incubator/harmony/enhanced/classlib/trunk/modules: applet/make/common/ archive/make/common/ auth/make/common/ awt/make/common/ beans/make/common/ crypto/make/common/ jndi/make/common/ logging/make/common/ luni/make/common/ mat...
Date Tue, 18 Apr 2006 08:37:23 GMT
Author: smishura
Date: Tue Apr 18 01:37:18 2006
New Revision: 394882

URL: http://svn.apache.org/viewcvs?rev=394882&view=rev
Log:
Apply updated patch for HARMONY-354 (Mechanism to run tests on an different jre)

Modified:
    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/regex/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/modules/applet/make/common/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/applet/make/common/build.xml?rev=394882&r1=394881&r2=394882&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 Tue Apr
18 01:37:18 2006
@@ -71,6 +71,8 @@
 		
 	        <mkdir dir="${hy.tests.reports}" />
 
+		<property name="test.jre.home" value="${hy.target}/jre" />
+
 	        <junit fork="yes"
 			forkmode="once"
 			printsummary="withOutAndErr"
@@ -78,11 +80,11 @@
 			failureproperty="test.failures"
 			showoutput="on"
 			dir="${hy.applet.bin.test}"
-			jvm="${hy.target}/jre/bin/java">
+			jvm="${test.jre.home}/bin/java">
 
 			<jvmarg value="-showversion"/>
 
-			<env key="JAVA_HOME" value="${hy.target}/jre"/>
+			<env key="JAVA_HOME" value="${test.jre.home}"/>
 
 			<classpath>
 				<pathelement path="${hy.applet.bin.test}"/>

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=394882&r1=394881&r2=394882&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 Tue Apr
18 01:37:18 2006
@@ -71,6 +71,8 @@
 		
 	        <mkdir dir="${hy.tests.reports}" />
 
+		<property name="test.jre.home" value="${hy.target}/jre" />
+
 	        <junit fork="yes"
 			forkmode="once"
 			printsummary="withOutAndErr"
@@ -78,11 +80,11 @@
 			failureproperty="test.failures"
 			showoutput="on"
 			dir="${hy.archive.bin.test}"
-			jvm="${hy.target}/jre/bin/java">
+			jvm="${test.jre.home}/bin/java">
 
 			<jvmarg value="-showversion"/>
 
-			<env key="JAVA_HOME" value="${hy.target}/jre"/>
+			<env key="JAVA_HOME" value="${test.jre.home}"/>
 
 			<classpath>
 				<pathelement path="${hy.archive.bin.test}"/>

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=394882&r1=394881&r2=394882&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 Tue Apr 18
01:37:18 2006
@@ -93,6 +93,8 @@
 		
 		<mkdir dir="${hy.tests.reports}" />
 
+		<property name="test.jre.home" value="${hy.target}/jre" />
+
         <junit fork="yes"
 			forkmode="once"
 			printsummary="withOutAndErr"
@@ -100,7 +102,7 @@
 			failureproperty="test.failures"
 			showoutput="on"
 			dir="${hy.auth.bin.test}"
-			jvm="${hy.target}/jre/bin/java">
+			jvm="${test.jre.home}/bin/java">
 
 			<!--jvmarg value="-showversion"/-->
 	        
@@ -113,7 +115,7 @@
 			<!-- to pick up junit.jar -->
 			<jvmarg value="-Xbootclasspath/a:${hy.auth.bin.test}${path.separator}../../../../${junit.jar}"/>
 
-			<env key="JAVA_HOME" value="${hy.target}/jre"/>
+			<env key="JAVA_HOME" value="${test.jre.home}"/>
 
 			<formatter type="xml" />
 

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=394882&r1=394881&r2=394882&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 Tue Apr 18
01:37:18 2006
@@ -71,6 +71,8 @@
 		
 	        <mkdir dir="${hy.tests.reports}" />
 
+		<property name="test.jre.home" value="${hy.target}/jre" />
+
 	        <junit fork="yes"
 			forkmode="once"
 			printsummary="withOutAndErr"
@@ -78,11 +80,11 @@
 			failureproperty="test.failures"
 			showoutput="on"
 			dir="${hy.awt.bin.test}"
-			jvm="${hy.target}/jre/bin/java">
+			jvm="${test.jre.home}/bin/java">
 
 			<jvmarg value="-showversion"/>
 
-			<env key="JAVA_HOME" value="${hy.target}/jre"/>
+			<env key="JAVA_HOME" value="${test.jre.home}"/>
 
 			<classpath>
 				<pathelement path="${hy.awt.bin.test}"/>

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=394882&r1=394881&r2=394882&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 Tue Apr
18 01:37:18 2006
@@ -71,6 +71,8 @@
 		
 	        <mkdir dir="${hy.tests.reports}" />
 
+		<property name="test.jre.home" value="${hy.target}/jre" />
+
 	        <junit fork="yes"
 			forkmode="once"
 			printsummary="withOutAndErr"
@@ -78,11 +80,11 @@
 			failureproperty="test.failures"
 			showoutput="on"
 			dir="${hy.beans.bin.test}"
-			jvm="${hy.target}/jre/bin/java">
+			jvm="${test.jre.home}/bin/java">
 
 			<jvmarg value="-showversion"/>
 
-			<env key="JAVA_HOME" value="${hy.target}/jre"/>
+			<env key="JAVA_HOME" value="${test.jre.home}"/>
 
 			<classpath>
 				<pathelement path="${hy.beans.bin.test}"/>

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=394882&r1=394881&r2=394882&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 Tue Apr
18 01:37:18 2006
@@ -83,6 +83,8 @@
 		
 	        <mkdir dir="${hy.tests.reports}" />
 
+		<property name="test.jre.home" value="${hy.target}/jre" />
+
 	        <junit fork="yes"
 			forkmode="once"
 			printsummary="withOutAndErr"
@@ -90,7 +92,7 @@
 			failureproperty="test.failures"
 			showoutput="on"
 			dir="${hy.crypto.bin.test}"
-			jvm="${hy.target}/jre/bin/java">
+			jvm="${test.jre.home}/bin/java">
 
 			<jvmarg value="-showversion"/>
 	        
@@ -100,7 +102,7 @@
 			<!-- files will be placed on the classpath             -->
 			<jvmarg value="-DTEST_SRC_DIR=${hy.crypto.src.test.java}"/>
 
-			<env key="JAVA_HOME" value="${hy.target}/jre"/>
+			<env key="JAVA_HOME" value="${test.jre.home}"/>
 
 			<!-- to pick up junit.jar               -->
 			<!-- FIXME: package access tests and    -->

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=394882&r1=394881&r2=394882&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 Tue Apr 18
01:37:18 2006
@@ -71,6 +71,8 @@
 		
 	        <mkdir dir="${hy.tests.reports}" />
 
+		<property name="test.jre.home" value="${hy.target}/jre" />
+
 	        <junit fork="yes"
 			forkmode="once"
 			printsummary="withOutAndErr"
@@ -78,11 +80,11 @@
 			failureproperty="test.failures"
 			showoutput="on"
 			dir="${hy.jndi.bin.test}"
-			jvm="${hy.target}/jre/bin/java">
+			jvm="${test.jre.home}/bin/java">
 
 			<jvmarg value="-showversion"/>
 
-			<env key="JAVA_HOME" value="${hy.target}/jre"/>
+			<env key="JAVA_HOME" value="${test.jre.home}"/>
 
 			<classpath>
 				<pathelement path="${hy.jndi.bin.test}"/>

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=394882&r1=394881&r2=394882&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 Tue Apr
18 01:37:18 2006
@@ -87,6 +87,8 @@
 		
 	        <mkdir dir="${hy.tests.reports}" />
 
+		<property name="test.jre.home" value="${hy.target}/jre" />
+
 	        <junit fork="yes"
 			forkmode="once"
 			printsummary="withOutAndErr"
@@ -94,11 +96,11 @@
 			failureproperty="test.failures"
 			showoutput="on"
 			dir="${hy.logging.bin.test}"
-			jvm="${hy.target}/jre/bin/java">
+			jvm="${test.jre.home}/bin/java">
 
 			<jvmarg value="-showversion"/>
 
-			<env key="JAVA_HOME" value="${hy.target}/jre"/>
+			<env key="JAVA_HOME" value="${test.jre.home}"/>
 
 			<bootclasspath>
 				<fileset dir="${hy.target}/jre/lib/boot">

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=394882&r1=394881&r2=394882&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 Tue Apr 18
01:37:18 2006
@@ -70,6 +70,8 @@
 
 		<mkdir dir="${hy.tests.reports}" />
 
+		<property name="test.jre.home" value="${hy.target}/jre" />
+
 		<junit fork="yes"
                        forkmode="once"
                        printsummary="withOutAndErr"
@@ -77,7 +79,7 @@
                        failureproperty="test.failures"
                        showoutput="on"
                        dir="${hy.luni.bin.test}"
-                       jvm="${hy.target}/jre/bin/java">
+                       jvm="${test.jre.home}/bin/java">
 
 			<jvmarg value="-showversion" />
 
@@ -87,7 +89,7 @@
 			<!-- Required for running the java.net unit tests -->
 			<jvmarg value="-Dtest.ini.file=../../../../src/test/resources/config/localhosttest.ini"
/>
 
-			<env key="JAVA_HOME" value="${hy.target}/jre" />
+			<env key="JAVA_HOME" value="${test.jre.home}" />
 
 			<classpath>
 				<pathelement path="${hy.luni.bin.test}" />

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=394882&r1=394881&r2=394882&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 Tue Apr 18
01:37:18 2006
@@ -71,6 +71,8 @@
 		
 	        <mkdir dir="${hy.tests.reports}" />
 
+		<property name="test.jre.home" value="${hy.target}/jre" />
+
 	        <junit fork="yes"
 			forkmode="once"
 			printsummary="withOutAndErr"
@@ -78,11 +80,11 @@
 			failureproperty="test.failures"
 			showoutput="on"
 			dir="${hy.math.bin.test}"
-			jvm="${hy.target}/jre/bin/java">
+			jvm="${test.jre.home}/bin/java">
 
 			<jvmarg value="-showversion"/>
 
-			<env key="JAVA_HOME" value="${hy.target}/jre"/>
+			<env key="JAVA_HOME" value="${test.jre.home}"/>
 
 			<classpath>
 				<pathelement path="${hy.math.bin.test}"/>

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=394882&r1=394881&r2=394882&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 Tue Apr 18
01:37:18 2006
@@ -71,6 +71,8 @@
 		
 	        <mkdir dir="${hy.tests.reports}" />
 
+		<property name="test.jre.home" value="${hy.target}/jre" />
+
 	        <junit fork="yes"
 			forkmode="once"
 			printsummary="withOutAndErr"
@@ -78,11 +80,11 @@
 			failureproperty="test.failures"
 			showoutput="on"
 			dir="${hy.nio.bin.test}"
-			jvm="${hy.target}/jre/bin/java">
+			jvm="${test.jre.home}/bin/java">
 
 			<jvmarg value="-showversion"/>
 
-			<env key="JAVA_HOME" value="${hy.target}/jre"/>
+			<env key="JAVA_HOME" value="${test.jre.home}"/>
 
 			<classpath>
 				<pathelement path="${hy.nio.bin.test}"/>

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=394882&r1=394881&r2=394882&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 Tue Apr
18 01:37:18 2006
@@ -71,6 +71,8 @@
 		
 	        <mkdir dir="${hy.tests.reports}" />
 
+		<property name="test.jre.home" value="${hy.target}/jre" />
+
 	        <junit fork="yes"
 			forkmode="once"
 			printsummary="withOutAndErr"
@@ -78,11 +80,11 @@
 			failureproperty="test.failures"
 			showoutput="on"
 			dir="${hy.nio_char.bin.test}"
-			jvm="${hy.target}/jre/bin/java">
+			jvm="${test.jre.home}/bin/java">
 
 			<jvmarg value="-showversion"/>
 
-			<env key="JAVA_HOME" value="${hy.target}/jre"/>
+			<env key="JAVA_HOME" value="${test.jre.home}"/>
 
 			<classpath>
 				<pathelement path="${hy.nio_char.bin.test}"/>

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=394882&r1=394881&r2=394882&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 Tue Apr
18 01:37:18 2006
@@ -71,6 +71,8 @@
 		
 	        <mkdir dir="${hy.tests.reports}" />
 
+		<property name="test.jre.home" value="${hy.target}/jre" />
+
 	        <junit fork="yes"
 			forkmode="once"
 			printsummary="withOutAndErr"
@@ -78,11 +80,11 @@
 			failureproperty="test.failures"
 			showoutput="on"
 			dir="${hy.prefs.bin.test}"
-			jvm="${hy.target}/jre/bin/java">
+			jvm="${test.jre.home}/bin/java">
 
 			<jvmarg value="-showversion"/>
 
-			<env key="JAVA_HOME" value="${hy.target}/jre"/>
+			<env key="JAVA_HOME" value="${test.jre.home}"/>
 
 			<classpath>
 				<pathelement path="${hy.prefs.bin.test}"/>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/regex/make/common/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/regex/make/common/build.xml?rev=394882&r1=394881&r2=394882&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/regex/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/regex/make/common/build.xml Tue Apr
18 01:37:18 2006
@@ -71,6 +71,8 @@
 		
 	        <mkdir dir="${hy.tests.reports}" />
 
+		<property name="test.jre.home" value="${hy.target}/jre" />
+
 	        <junit fork="yes"
 			forkmode="once"
 			printsummary="withOutAndErr"
@@ -78,11 +80,11 @@
 			failureproperty="test.failures"
 			showoutput="on"
 			dir="${hy.regex.bin.test}"
-			jvm="${hy.target}/jre/bin/java">
+			jvm="${test.jre.home}/bin/java">
 
 			<jvmarg value="-showversion"/>
 
-			<env key="JAVA_HOME" value="${hy.target}/jre"/>
+			<env key="JAVA_HOME" value="${test.jre.home}"/>
 
 			<classpath>
 				<pathelement path="${hy.regex.bin.test}"/>

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=394882&r1=394881&r2=394882&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 Tue Apr 18
01:37:18 2006
@@ -71,6 +71,8 @@
 		
 	        <mkdir dir="${hy.tests.reports}" />
 
+		<property name="test.jre.home" value="${hy.target}/jre" />
+
 	        <junit fork="yes"
 			forkmode="once"
 			printsummary="withOutAndErr"
@@ -78,11 +80,11 @@
 			failureproperty="test.failures"
 			showoutput="on"
 			dir="${hy.rmi.bin.test}"
-			jvm="${hy.target}/jre/bin/java">
+			jvm="${test.jre.home}/bin/java">
 
 			<jvmarg value="-showversion"/>
 
-			<env key="JAVA_HOME" value="${hy.target}/jre"/>
+			<env key="JAVA_HOME" value="${test.jre.home}"/>
 
 			<classpath>
 				<pathelement path="${hy.rmi.bin.test}"/>

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=394882&r1=394881&r2=394882&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 Tue Apr
18 01:37:18 2006
@@ -72,6 +72,8 @@
 		
 	        <mkdir dir="${hy.tests.reports}" />
 
+		<property name="test.jre.home" value="${hy.target}/jre" />
+
 	        <junit fork="yes"
 			forkmode="once"
 			printsummary="withOutAndErr"
@@ -79,7 +81,7 @@
 			failureproperty="test.failures"
 			showoutput="on"
 			dir="${hy.security.bin.test}"
-			jvm="${hy.target}/jre/bin/java">
+			jvm="${test.jre.home}/bin/java">
 
 			<!--jvmarg value="-showversion"/-->
 	        
@@ -92,7 +94,7 @@
 			<!-- to pick up junit.jar -->
 			<jvmarg value="-Xbootclasspath/a:${hy.security.bin.test}${path.separator}../../../../${junit.jar}${path.separator}../../../../build/tests"/>
 
-			<env key="JAVA_HOME" value="${hy.target}/jre"/>
+			<env key="JAVA_HOME" value="${test.jre.home}"/>
 
 			<formatter type="xml" />
 

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=394882&r1=394881&r2=394882&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 Tue Apr 18
01:37:18 2006
@@ -71,6 +71,8 @@
 		
 	        <mkdir dir="${hy.tests.reports}" />
 
+		<property name="test.jre.home" value="${hy.target}/jre" />
+
 	        <junit fork="yes"
 			forkmode="once"
 			printsummary="withOutAndErr"
@@ -78,11 +80,11 @@
 			failureproperty="test.failures"
 			showoutput="on"
 			dir="${hy.sql.bin.test}"
-			jvm="${hy.target}/jre/bin/java">
+			jvm="${test.jre.home}/bin/java">
 
 			<jvmarg value="-showversion"/>
 
-			<env key="JAVA_HOME" value="${hy.target}/jre"/>
+			<env key="JAVA_HOME" value="${test.jre.home}"/>
 
 			<classpath>
 				<pathelement path="${hy.sql.bin.test}"/>

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=394882&r1=394881&r2=394882&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 Tue Apr 18
01:37:18 2006
@@ -71,6 +71,8 @@
 		
 	        <mkdir dir="${hy.tests.reports}" />
 
+		<property name="test.jre.home" value="${hy.target}/jre" />
+
 	        <junit fork="yes"
 			forkmode="once"
 			printsummary="withOutAndErr"
@@ -78,11 +80,11 @@
 			failureproperty="test.failures"
 			showoutput="on"
 			dir="${hy.text.bin.test}"
-			jvm="${hy.target}/jre/bin/java">
+			jvm="${test.jre.home}/bin/java">
 
 			<jvmarg value="-showversion"/>
 
-			<env key="JAVA_HOME" value="${hy.target}/jre"/>
+			<env key="JAVA_HOME" value="${test.jre.home}"/>
 
 			<classpath>
 				<pathelement path="${hy.text.bin.test}"/>

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=394882&r1=394881&r2=394882&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 Tue Apr
18 01:37:18 2006
@@ -78,6 +78,8 @@
 		
 	        <mkdir dir="${hy.tests.reports}" />
 
+		<property name="test.jre.home" value="${hy.target}/jre" />
+
 	        <junit fork="yes"
 			forkmode="once"
 			printsummary="withOutAndErr"
@@ -85,7 +87,7 @@
 			failureproperty="test.failures"
 			showoutput="on"
 			dir="${hy.x-net.bin.test}"
-			jvm="${hy.target}/jre/bin/java">
+			jvm="${test.jre.home}/bin/java">
 
 			<jvmarg value="-showversion"/>
 	        
@@ -95,7 +97,7 @@
 			<!-- files will be placed on the classpath             -->
 			<jvmarg value="-DTEST_SRC_DIR=${hy.x-net.src.test.java}"/>
 
-			<env key="JAVA_HOME" value="${hy.target}/jre"/>
+			<env key="JAVA_HOME" value="${test.jre.home}"/>
 
 			<classpath>
 				<pathelement path="${hy.x-net.bin.test}"/>



Mime
View raw message