Sounds good to me.
Sent from my iPhone
On Apr 15, 2009, at 6:29 AM, Tim Ellison <[email protected]> wrote:
This doesn't work for me...
with casesensitive="false" the IBM VM fails to be recognized, and I
get
hy.test.vm.name = drl
It was matching on lowercase "harmony" in the last line of the DRLVM
version string
Apache Harmony Launcher : (c) Copyright 1991, 2008 The Apache Software
Foundation or its licensors, as applicable.
java version "1.5.0"
pre-alpha : not complete or compatible
svn = r761593, (Apr 3 2009), Windows/ia32/msvc 1310, release build
http://harmony.apache.org
and now it is case insensitive it matches the second line in
java version "1.4.2 subset"
Harmony Virtual Machine Element (2.3)
J9 (2.3)
IBM J9 2.3 Windows XP x86-32 (JIT enabled)
J9VM - 20060727_07300_lHdSMR
JIT - 20060727_1808_r8
GC - 20060724_AA
How about we flip it around and test explicitly for IBM and default to
DRLVM.
Index: properties.xml
===================================================================
--- properties.xml (revision 765035)
+++ properties.xml (working copy)
@@ -452,8 +452,8 @@
</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"
casesensitive="false" />
+ <condition property="hy.test.vm.name" value="ibm"
else="drl" >
+ <contains string="${test.vm.info.tmp}" substring="IBM"
casesensitive="false" />
</condition>
<echo level="info" message="hy.test.vm.name =
${hy.test.vm.name}" />
</target>
Regards,
Tim
[email protected] wrote:
Author: ndbeyer
Date: Wed Apr 15 02:07:59 2009
New Revision: 765035
URL: http://svn.apache.org/viewvc?rev=765035&view=rev
Log:
make vm info test case insensitive
Modified:
harmony/enhanced/classlib/trunk/make/properties.xml
Modified: harmony/enhanced/classlib/trunk/make/properties.xml
URL:
http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/properties.xml?rev=765035&r1=765034&r2=765035&view=diff
===
===
===
=====================================================================
--- harmony/enhanced/classlib/trunk/make/properties.xml (original)
+++ harmony/enhanced/classlib/trunk/make/properties.xml Wed Apr 15
02:07:59 2009
@@ -442,6 +442,7 @@
</target>
<target name="test-jre-vm-info" depends="-get-test-vm-output">
+ <echo level="info" message="java -version${line.separator}$
{test.vm.info.tmp}" />
<!-- Add other runtime names here -->
<condition property="hy.test.vm.name" value="ri" >
<contains string="${test.vm.info.tmp}"
substring="HotSpot"/>
@@ -452,7 +453,7 @@
<!-- 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" />
+ <contains string="${test.vm.info.tmp}"
substring="harmony" casesensitive="false" />
</condition>
<echo level="info" message="hy.test.vm.name = $
{hy.test.vm.name}" />
</target>
