You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by sm...@apache.org on 2007/09/06 05:42:52 UTC
svn commit: r573143 - in /harmony/enhanced/buildtest/branches/2.0/adaptors:
ehwa-api/adaptor.xml jdktools-test/adaptor.xml
Author: smishura
Date: Wed Sep 5 20:42:51 2007
New Revision: 573143
URL: http://svn.apache.org/viewvc?rev=573143&view=rev
Log:
Use standart platform properties provided by the framework
Modified:
harmony/enhanced/buildtest/branches/2.0/adaptors/ehwa-api/adaptor.xml
harmony/enhanced/buildtest/branches/2.0/adaptors/jdktools-test/adaptor.xml
Modified: harmony/enhanced/buildtest/branches/2.0/adaptors/ehwa-api/adaptor.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/adaptors/ehwa-api/adaptor.xml?rev=573143&r1=573142&r2=573143&view=diff
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/adaptors/ehwa-api/adaptor.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/adaptors/ehwa-api/adaptor.xml Wed Sep 5 20:42:51 2007
@@ -26,49 +26,31 @@
<!--
Define properties describing platform type
-->
- <condition property="is.windows">
- <os family="windows"/>
- </condition>
-
- <condition property="is.linux">
- <and>
- <os family="unix"/>
- <os name="linux"/>
- </and>
- </condition>
-
- <condition property="is.64bit">
- <or>
- <contains string="${os.arch}" substring="86_64"/>
- <contains string="${os.arch}" substring="amd64"/>
- </or>
- </condition>
-
<condition property="is.windows.x86">
<and>
<isset property="is.windows"/>
- <not><isset property="is.64bit"/></not>
+ <isset property="is.x86" />
</and>
</condition>
<condition property="is.windows.x86_64">
<and>
<isset property="is.windows"/>
- <isset property="is.64bit"/>
+ <isset property="is.x86_64" />
</and>
</condition>
<condition property="is.linux.x86">
<and>
<isset property="is.linux"/>
- <not><isset property="is.64bit"/></not>
+ <isset property="is.x86" />
</and>
</condition>
<condition property="is.linux.x86_64">
<and>
<isset property="is.linux"/>
- <isset property="is.64bit"/>
+ <isset property="is.x86_64" />
</and>
</condition>
Modified: harmony/enhanced/buildtest/branches/2.0/adaptors/jdktools-test/adaptor.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/adaptors/jdktools-test/adaptor.xml?rev=573143&r1=573142&r2=573143&view=diff
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/adaptors/jdktools-test/adaptor.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/adaptors/jdktools-test/adaptor.xml Wed Sep 5 20:42:51 2007
@@ -19,10 +19,7 @@
<!-- On 64-bit platform tests should be run in interpreter mode only -->
<condition property="hy.test.vmargs.value" value="-Xint" else="">
- <or>
- <equals arg1="x86_64" arg2="${os.arch}" />
- <equals arg1="amd64" arg2="${os.arch}" />
- </or>
+ <isset property="is.x86_64" />
</condition>
<property name="tests.results.dir" value="${built.trunk.dir}/build/test_report"/>