svn commit: r520845 - in /harmony/enhanced/classlib/trunk/make: build-test.xml properties.xml

[ay...@apache.org]

Author: ayza
Date: Wed Mar 21 04:35:43 2007
New Revision: 520845

URL: http://svn.apache.org/viewvc?view=rev&rev=520845
Log:
Committing patch from HARMONY-3014 ([classlib][exclude] runtime name should be defined automatically)

Modified:
    harmony/enhanced/classlib/trunk/make/build-test.xml
    harmony/enhanced/classlib/trunk/make/properties.xml

Modified: harmony/enhanced/classlib/trunk/make/build-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/build-test.xml?view=diff&rev=520845&r1=520844&r2=520845
==============================================================================
--- harmony/enhanced/classlib/trunk/make/build-test.xml (original)
+++ harmony/enhanced/classlib/trunk/make/build-test.xml Wed Mar 21 04:35:43 2007
@@ -48,7 +48,7 @@
         <delete file="${hy.hdk}/build/test/support.jar" />
     </target>
 
-    <target name="test-modules" depends="support-jar">
+    <target name="test-modules" depends="support-jar, test-jre-vm-info">
         <call-modules target="-test-module" />
     </target>
 

Modified: harmony/enhanced/classlib/trunk/make/properties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/properties.xml?view=diff&rev=520845&r1=520844&r2=520845
==============================================================================
--- harmony/enhanced/classlib/trunk/make/properties.xml (original)
+++ harmony/enhanced/classlib/trunk/make/properties.xml Wed Mar 21 04:35:43 2007
@@ -47,7 +47,6 @@
     <!-- Test run property -->
     <property name="hy.test.forkmode" value="once" />
     <property name="hy.test.timeout" value="900000" />
-    <property name="hy.test.vm.name" value="ibm" />
     <property name="hy.test.vmargs" value="" />
 
     <!-- Conditions for operating systems -->
@@ -233,7 +232,7 @@
         </not>
     </condition>
 
-    <target name="echo" depends="svn-prop, svn-info"
+    <target name="echo" depends="svn-prop, svn-info, test-jre-vm-info"
             description="Display the properties defined by this ant file" >
         <echo>
 Harmony release configuration property:
@@ -349,10 +348,34 @@
         </tstamp>
     </target>
 
+    <target name="test-jre-vm-info" depends="-get-test-vm-output">
+        <!-- Add other runtime names here -->
+        <condition property="hy.test.vm.name" value="ri" >
+            <contains string="${test.vm.info.tmp}" substring="HotSpot"/>
+        </condition>
+        <condition property="hy.test.vm.name" value="jr" >
+            <contains string="${test.vm.info.tmp}" substring="JRockit"/>
+        </condition>
+        <!-- FIXME current behavior relies on the fact that J9 VM doesn't
+             support -version parameter -->
+        <condition property="hy.test.vm.name" value="drl" else="ibm" >
+            <contains string="${test.vm.info.tmp}" substring="harmony" />
+        </condition>
+        <echo message="hy.test.vm.name = ${hy.test.vm.name}" />
+    </target>
+
+    <target name="-get-test-vm-output" if="test.jre.home">
+        <exec executable="${test.jre.home}/bin/java" failifexecutionfails="false">
+            <arg value="-version" />
+            <redirector outputproperty="test.vm.info.tmp"/>
+        </exec>
+    </target>
+
     <macrodef name="call-modules">
         <attribute name="target" />
         <sequential>
             <subant target="@{target}">
+                <property name="hy.test.vm.name" value="${hy.test.vm.name}"/>
                 <dirset dir="modules" includes="${build.module}" excludes="${exclude.module}" />
             </subant>
         </sequential>