svn commit: r688439 - /harmony/enhanced/common_resources/trunk/make/properties.xml

[nd...@apache.org]

Author: ndbeyer
Date: Sat Aug 23 19:20:41 2008
New Revision: 688439

URL: http://svn.apache.org/viewvc?rev=688439&view=rev
Log:
vm test doesn't work unless test.jre.home is explicitly set, so it always defaulted to 'ibm'; it has been enhanced to look at hy.hdk if test.jre.home isn't set

Modified:
    harmony/enhanced/common_resources/trunk/make/properties.xml

Modified: harmony/enhanced/common_resources/trunk/make/properties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/common_resources/trunk/make/properties.xml?rev=688439&r1=688438&r2=688439&view=diff
==============================================================================
--- harmony/enhanced/common_resources/trunk/make/properties.xml (original)
+++ harmony/enhanced/common_resources/trunk/make/properties.xml Sat Aug 23 19:20:41 2008
@@ -226,10 +226,13 @@
         <condition property="hy.test.vm.name" value="drl" else="ibm" >
             <contains string="${test.vm.info.tmp}" substring="harmony" />
         </condition>
-        <echo level="verbose" message="hy.test.vm.name = ${hy.test.vm.name}" />
+        <echo level="info" message="hy.test.vm.name = ${hy.test.vm.name}" />
     </target>
 
-    <target name="-get-test-vm-output" if="test.jre.home">
+    <target name="-get-test-vm-output">
+        <condition property="test.jre.home" value="${hy.jdk}/jre">
+            <not><isset property="test.jre.home" /></not>
+        </condition>
         <exec executable="${test.jre.home}/bin/java" failifexecutionfails="false">
             <arg value="-version" />
             <redirector outputproperty="test.vm.info.tmp"/>