harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ge...@apache.org
Subject svn commit: r449925 - in /incubator/harmony/enhanced/drlvm/trunk/build/make/targets: cunit.test.xml kernel.test.xml smoke.test.xml
Date Tue, 26 Sep 2006 06:23:11 GMT
Author: geirm
Date: Mon Sep 25 23:23:10 2006
New Revision: 449925

URL: http://svn.apache.org/viewvc?view=rev&rev=449925
Log:
HARMONY-1569

Set JAVA_HOME to runtime being tested for test cases
for safety

Ubuntu 5, smoke and c-unit


Modified:
    incubator/harmony/enhanced/drlvm/trunk/build/make/targets/cunit.test.xml
    incubator/harmony/enhanced/drlvm/trunk/build/make/targets/kernel.test.xml
    incubator/harmony/enhanced/drlvm/trunk/build/make/targets/smoke.test.xml

Modified: incubator/harmony/enhanced/drlvm/trunk/build/make/targets/cunit.test.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/build/make/targets/cunit.test.xml?view=diff&rev=449925&r1=449924&r2=449925
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/build/make/targets/cunit.test.xml (original)
+++ incubator/harmony/enhanced/drlvm/trunk/build/make/targets/cunit.test.xml Mon Sep 25 23:23:10
2006
@@ -164,6 +164,7 @@
                               executable="${unit.test.c.workdir}/_bin/${filename}${extention}"
                               resultproperty="resultproperty"
                               outputproperty="outputproperty">
+                    <env key="JAVA_HOME" value="${build.deploy.dir}" />
                     <select os="lnx">
                         <env key="LD_LIBRARY_PATH" path="${unit.test.c.workdir}/_bin"
/>
                     </select>

Modified: incubator/harmony/enhanced/drlvm/trunk/build/make/targets/kernel.test.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/build/make/targets/kernel.test.xml?view=diff&rev=449925&r1=449924&r2=449925
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/build/make/targets/kernel.test.xml (original)
+++ incubator/harmony/enhanced/drlvm/trunk/build/make/targets/kernel.test.xml Mon Sep 25 23:23:10
2006
@@ -147,6 +147,9 @@
             haltonfailure="no" failureproperty="batch.failed"
             filtertrace="no" printsummary="on"
             jvm="${build.deploy.dir}/bin/java">
+
+            <env key="JAVA_HOME" value="${build.deploy.dir}"/>
+
             <jvmarg value="-Dtest.resource.path=${test.resource.path}"/>
             <jvmarg value="-Dvm.assert_dialog=0" />
             <jvmarg value="-Xbootclasspath/a:${junit.jar}${path.separator}${test.class.path}"
/>
@@ -190,6 +193,9 @@
                 <junit fork="yes" failureproperty="@{test}.failed"
                     timeout="${kernel.test.timeout}" newenvironment="yes" filtertrace="no"
                     jvm="${build.deploy.dir}/bin/java">
+
+                    <env key="JAVA_HOME" value="${build.deploy.dir}"/>
+
                     <!--env key="LD_LIBRARY_PATH" value="${build.deploy.dir}/bin:${env.LD_LIBRARY_PATH}"
/-->
                     <env key="SYSTEMDRIVE" value="${env.SystemDrive}" />
                     <env key="HOME" value="${env.HOME}" />
@@ -220,6 +226,10 @@
                         <junit fork="yes" failureproperty="@{test}.ref.failed" 
                             timeout="${kernel.test.timeout}" 
                             newenvironment="yes" filtertrace="no">
+
+
+                            <env key="JAVA_HOME" value="${build.deploy.dir}"/>
+
                             <!--env key="LD_LIBRARY_PATH" value="${build.deploy.dir}/bin:${env.LD_LIBRARY_PATH}"
/-->
                             <env key="SYSTEMDRIVE" value="${env.SystemDrive}" />
                             <env key="HOME" value="${env.HOME}" />

Modified: incubator/harmony/enhanced/drlvm/trunk/build/make/targets/smoke.test.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/build/make/targets/smoke.test.xml?view=diff&rev=449925&r1=449924&r2=449925
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/build/make/targets/smoke.test.xml (original)
+++ incubator/harmony/enhanced/drlvm/trunk/build/make/targets/smoke.test.xml Mon Sep 25 23:23:10
2006
@@ -123,6 +123,7 @@
                                     <jvmarg value="${int.or.jit.arg}" />
                                     <jvmarg value="-classpath" />
                                     <jvmarg value="${build.dir}/_smoke.tests/classes"
/>
+                                    <env key="JAVA_HOME" value="${build.deploy.dir}" />
                                     <env key="LD_LIBRARY_PATH" value="${build.deploy.dir}/bin:${env.LD_LIBRARY_PATH}"
/>
                                 </java>
                             </then>
@@ -131,6 +132,7 @@
                                     <jvmarg value="-Dvm.assert_dialog=0" />
                                     <jvmarg value="-classpath" />
                                     <jvmarg value="${build.dir}/_smoke.tests/classes"
/>
+                                    <env key="JAVA_HOME" value="${build.deploy.dir}" />
                                     <env key="LD_LIBRARY_PATH" value="${build.deploy.dir}/bin:${env.LD_LIBRARY_PATH}"
/>
                                 </java>
                             </else>



Mime
View raw message