You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by iv...@apache.org on 2007/07/04 06:13:42 UTC

svn commit: r553064 - in /harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func: api/java/beans/persistence/ api/java/lang/F_ClassLoaderTest_01/ api/javax/naming/ api/javax/naming/directory/ api/javax...

Author: ivavladimir
Date: Tue Jul  3 21:13:40 2007
New Revision: 553064

URL: http://svn.apache.org/viewvc?view=rev&rev=553064
Log:
macros in tests were updated. All these changes are equivalent so functionality was not updated

Modified:
    harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/api/java/beans/persistence/DecoderTest.xml
    harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/api/java/lang/F_ClassLoaderTest_01/F_ClassLoaderTest_01.xml
    harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/api/javax/naming/Naming_RMI.xml
    harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/api/javax/naming/directory/JNDI_DNS_SP.xml
    harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/api/javax/naming/ldap/JNDI_LDAP_SP_basicauth.xml
    harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/api/javax/naming/ldap/JNDI_LDAP_SP_simpleauth.xml
    harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/api/javax/naming/ldap/JNDI_LDAP_SP_sslauth.xml
    harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/api/javax/naming/provider/dns/CompositeNamesInUnsupportedMethodsTest.xml
    harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/api/javax/naming/provider/dns/DnsTest1.xml
    harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/api/javax/naming/provider/dns/UnsupportedMethodsTest.xml
    harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/api/javax/naming/provider/rmi/functional.xml
    harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jit/HLO/devirt/Runtime/RuntimeExtend1/RuntimeExtend1.xml
    harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/reg/jit/btest5942/Btest5942.xml
    harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/reg/vm/btest4492/Btest4492.xml
    harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/vm/cli/Xjit/Xjit03/Xjit03.xml
    harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/vm/cli/Xtrace/Xtrace03/Xtrace03.xml
    harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/vm/cli/Xverbose/Xverbose03/Xverbose03.xml
    harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/vm/cli/Xverbose/Xverbose08/Xverbose08.xml
    harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/vm/cli/Xverboselog/Xverboselog05/Xverboselog05.xml
    harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/vm/cli/Xwarn/Xwarn03/Xwarn03.xml
    harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/vm/cli/Xwarn/Xwarn08/Xwarn08.xml
    harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/vm/cli/verbose/verbose04/verbose04.xml

Modified: harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/api/java/beans/persistence/DecoderTest.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/api/java/beans/persistence/DecoderTest.xml?view=diff&rev=553064&r1=553063&r2=553064
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/api/java/beans/persistence/DecoderTest.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/api/java/beans/persistence/DecoderTest.xml Tue Jul  3 21:13:40 2007
@@ -41,7 +41,7 @@
         <Param name="toRun"
             value="org.apache.harmony.test.func.api.java.beans.persistence.DecoderTest">
             <Option
-                value="$ReferenceRuntime -cp $TestSuiteRoot$FileSeparatorbin$FileSeparatorclasses" />
+                value="$ReferenceRuntime -cp $TestSuiteClassRoot" />
         </Param>
     </Runner>
 </Test>

Modified: harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/api/java/lang/F_ClassLoaderTest_01/F_ClassLoaderTest_01.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/api/java/lang/F_ClassLoaderTest_01/F_ClassLoaderTest_01.xml?view=diff&rev=553064&r1=553063&r2=553064
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/api/java/lang/F_ClassLoaderTest_01/F_ClassLoaderTest_01.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/api/java/lang/F_ClassLoaderTest_01/F_ClassLoaderTest_01.xml Tue Jul  3 21:13:40 2007
@@ -84,7 +84,7 @@
                 <Modification date="2004-12-23" />
                 
         <Runner ID="Runtime">
-            <Option name="-cp" value="$CP$PathSeparator$TestSuiteRoot$FileSeparatorsrc$FileSeparatortest"/>                
+            <Option name="-cp" value="$CP$PathSeparator$TestSuiteTestRoot"/>                
             <Param name="toRun" value="org.apache.harmony.test.func.api.java.lang.F_ClassLoaderTest_01.F_ClassLoaderTest_01">
             </Param>
         </Runner>

Modified: harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/api/javax/naming/Naming_RMI.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/api/javax/naming/Naming_RMI.xml?view=diff&rev=553064&r1=553063&r2=553064
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/api/javax/naming/Naming_RMI.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/api/javax/naming/Naming_RMI.xml Tue Jul  3 21:13:40 2007
@@ -70,11 +70,9 @@
 
     <Runner ID="Runtime">
 
+        <Option name="-cp" value="$TestSuiteClassRoot$PathSeparator$TestSuiteLibRoot$FileSeparatorjndi$FileSeparatorproviders.jar" />
         <Param name="toRun"
             value="org.apache.harmony.test.func.api.javax.naming.NamingTest">
-            <Option name="vmParam" value="-cp" />
-            <Option name="vmParam"
-                value="$TestSuiteRoot$FileSeparatorbin$FileSeparatorclasses$PathSeparator$TestSuiteRoot$FileSeparatorbin$FileSeparatorlib$FileSeparatorjndi$FileSeparatorproviders.jar" />
             <Option name="xmlPath"
                 value="org/apache/harmony/test/func/api/javax/naming/share/jndiRMITest.xml" />
             <Option name="testName" value="regular" />

Modified: harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/api/javax/naming/directory/JNDI_DNS_SP.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/api/javax/naming/directory/JNDI_DNS_SP.xml?view=diff&rev=553064&r1=553063&r2=553064
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/api/javax/naming/directory/JNDI_DNS_SP.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/api/javax/naming/directory/JNDI_DNS_SP.xml Tue Jul  3 21:13:40 2007
@@ -151,9 +151,9 @@
 
     <Source name="JNDITest.java" />
     <Runner ID="Runtime">
+        <Option name="-cp" value="$TestSuiteClassRoot$PathSeparator$TestSuiteLibRoot$FileSeparatorjndi$FileSeparatorproviders.jar" />
         <Param name="toRun"
-            value="org.apache.harmony.test.func.api.javax.naming.directory.JNDITest">            <Option name="vmParam" value="-cp" />            <Option name="vmParam"
-                value="$TestSuiteRoot$FileSeparatorbin$FileSeparatorclasses$PathSeparator$TestSuiteRoot$FileSeparatorbin$FileSeparatorlib$FileSeparatorjndi$FileSeparatorproviders.jar" />
+            value="org.apache.harmony.test.func.api.javax.naming.directory.JNDITest">            
             <Option name="xmlPath"
                 value="org/apache/harmony/test/func/api/javax/naming/share/jndiDNSTest.xml" />
             <Option name="testName" value="extended" />

Modified: harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/api/javax/naming/ldap/JNDI_LDAP_SP_basicauth.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/api/javax/naming/ldap/JNDI_LDAP_SP_basicauth.xml?view=diff&rev=553064&r1=553063&r2=553064
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/api/javax/naming/ldap/JNDI_LDAP_SP_basicauth.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/api/javax/naming/ldap/JNDI_LDAP_SP_basicauth.xml Tue Jul  3 21:13:40 2007
@@ -122,9 +122,9 @@
 
     <Source name="../directory/JNDITest.java" />
     <Runner ID="Runtime">
+        <Option name="-cp" value="$TestSuiteClassRoot$PathSeparator$TestSuiteLibRoot$FileSeparatorjndi$FileSeparatorproviders.jar" />
         <Param name="toRun"
-            value="org.apache.harmony.test.func.api.javax.naming.directory.JNDITest">            <Option name="vmParam" value="-cp" />            <Option name="vmParam"
-                value="$TestSuiteRoot$FileSeparatorbin$FileSeparatorclasses$PathSeparator$TestSuiteRoot$FileSeparatorbin$FileSeparatorlib$FileSeparatorjndi$FileSeparatorproviders.jar" />
+            value="org.apache.harmony.test.func.api.javax.naming.directory.JNDITest">
             <Option name="xmlPath"
                 value="org/apache/harmony/test/func/api/javax/naming/share/jndiLDAPTest.xml" />
             <Option name="testName" value="basic" />

Modified: harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/api/javax/naming/ldap/JNDI_LDAP_SP_simpleauth.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/api/javax/naming/ldap/JNDI_LDAP_SP_simpleauth.xml?view=diff&rev=553064&r1=553063&r2=553064
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/api/javax/naming/ldap/JNDI_LDAP_SP_simpleauth.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/api/javax/naming/ldap/JNDI_LDAP_SP_simpleauth.xml Tue Jul  3 21:13:40 2007
@@ -185,13 +185,10 @@
 
     <Source name="JNDITest.java" />
     <Runner ID="Runtime">
+        <Option name="-cp" value="$TestSuiteClassRoot$PathSeparator$TestSuiteLibRoot$FileSeparatorjndi$FileSeparatorproviders.jar" />
+
         <Param name="toRun"
             value="org.apache.harmony.test.func.api.javax.naming.directory.JNDITest">
-
-            <Option name="vmParam" value="-cp" />
-
-            <Option name="vmParam"
-                value="$TestSuiteRoot$FileSeparatorbin$FileSeparatorclasses$PathSeparator$TestSuiteRoot$FileSeparatorbin$FileSeparatorlib$FileSeparatorjndi$FileSeparatorproviders.jar" />
 
             <Option name="xmlPath"
                 value="org/apache/harmony/test/func/api/javax/naming/share/jndiLDAPTest.xml" />

Modified: harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/api/javax/naming/ldap/JNDI_LDAP_SP_sslauth.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/api/javax/naming/ldap/JNDI_LDAP_SP_sslauth.xml?view=diff&rev=553064&r1=553063&r2=553064
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/api/javax/naming/ldap/JNDI_LDAP_SP_sslauth.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/api/javax/naming/ldap/JNDI_LDAP_SP_sslauth.xml Tue Jul  3 21:13:40 2007
@@ -143,13 +143,10 @@
 
     <Source name="../directory/JNDITest.java" />
     <Runner ID="Runtime">
+        <Option name="-cp" value="$TestSuiteClassRoot$PathSeparator$TestSuiteLibRoot$FileSeparatorjndi$FileSeparatorproviders.jar" />
+        <Option value="-Djavax.net.ssl.trustStore=$TestSuiteClassRoot$FileSeparatororg$FileSeparatorapache$FileSeparatorharmony$FileSeparatortest$FileSeparatorfunc$FileSeparatorapi$FileSeparatorjavax$FileSeparatornaming$FileSeparatorshare$FileSeparatorkeystore" />
         <Param name="toRun"
             value="org.apache.harmony.test.func.api.javax.naming.directory.JNDITest">
-            <Option name="vmParam" value="-cp" />
-            <Option name="vmParam"
-                value="$TestSuiteRoot$FileSeparatorbin$FileSeparatorclasses$PathSeparator$TestSuiteRoot$FileSeparatorbin$FileSeparatorlib$FileSeparatorjndi$FileSeparatorproviders.jar" />
-            <Option name="vmParam"
-                value="-Djavax.net.ssl.trustStore=$TestSuiteRoot$FileSeparatorbin$FileSeparatorclasses$FileSeparatororg$FileSeparatorapache$FileSeparatorharmony$FileSeparatortest$FileSeparatorfunc$FileSeparatorapi$FileSeparatorjavax$FileSeparatornaming$FileSeparatorshare$FileSeparatorkeystore" />
             <Option name="xmlPath"
                 value="org/apache/harmony/test/func/api/javax/naming/share/jndiLDAPTest.xml" />
             <Option name="testName" value="ssl" />

Modified: harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/api/javax/naming/provider/dns/CompositeNamesInUnsupportedMethodsTest.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/api/javax/naming/provider/dns/CompositeNamesInUnsupportedMethodsTest.xml?view=diff&rev=553064&r1=553063&r2=553064
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/api/javax/naming/provider/dns/CompositeNamesInUnsupportedMethodsTest.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/api/javax/naming/provider/dns/CompositeNamesInUnsupportedMethodsTest.xml Tue Jul  3 21:13:40 2007
@@ -116,11 +116,9 @@
 
     <Source name="CompositeNamesInUnsupportedMethodsTest.java" />
     <Runner ID="MultiCase">
+        <Option name="-cp" value="$TestSuiteClassRoot$PathSeparator$TestSuiteLibRoot$FileSeparatorjndi$FileSeparatorproviders.jar" />
         <Param name="toRun"
             value="org.apache.harmony.test.func.api.javax.naming.provider.dns.CompositeNamesInUnsupportedMethodsTest">
-            <Option name="vmParam" value="-cp" />
-            <Option name="vmParam"
-                value="$TestSuiteRoot$FileSeparatorbin$FileSeparatorclasses$PathSeparator$TestSuiteRoot$FileSeparatorbin$FileSeparatorlib$FileSeparatorjndi$FileSeparatorproviders.jar" />
             <Option name="PROVIDER_URL" value="$DNS_PROVIDER_URL" />
         </Param>
     </Runner>

Modified: harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/api/javax/naming/provider/dns/DnsTest1.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/api/javax/naming/provider/dns/DnsTest1.xml?view=diff&rev=553064&r1=553063&r2=553064
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/api/javax/naming/provider/dns/DnsTest1.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/api/javax/naming/provider/dns/DnsTest1.xml Tue Jul  3 21:13:40 2007
@@ -74,9 +74,8 @@
 
         <Source name="DnsTest1.java"/>
         <Runner ID="MultiCase">
+            <Option name="-cp" value="$TestSuiteClassRoot$PathSeparator$TestSuiteLibRoot$FileSeparatorjndi$FileSeparatorproviders.jar"/>
             <Param name="toRun" value="org.apache.harmony.test.func.api.javax.naming.provider.dns.DnsTest1">
-                <Option name="vmParam" value="-cp"/>
-                <Option name="vmParam" value="$TestSuiteRoot$FileSeparatorbin$FileSeparatorclasses$PathSeparator$TestSuiteRoot$FileSeparatorbin$FileSeparatorlib$FileSeparatorjndi$FileSeparatorproviders.jar"/>
                 <Option name="PROVIDER_URL" value="$DNS_PROVIDER_URL"/>
             </Param>
         </Runner>

Modified: harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/api/javax/naming/provider/dns/UnsupportedMethodsTest.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/api/javax/naming/provider/dns/UnsupportedMethodsTest.xml?view=diff&rev=553064&r1=553063&r2=553064
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/api/javax/naming/provider/dns/UnsupportedMethodsTest.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/api/javax/naming/provider/dns/UnsupportedMethodsTest.xml Tue Jul  3 21:13:40 2007
@@ -148,11 +148,9 @@
 
     <Source name="UnsupportedMethodsTest.java" />
     <Runner ID="MultiCase">
+        <Option name="-cp" value="$TestSuiteClassRoot$PathSeparator$TestSuiteLibRoot$FileSeparatorjndi$FileSeparatorproviders.jar" />
         <Param name="toRun"
             value="org.apache.harmony.test.func.api.javax.naming.provider.dns.UnsupportedMethodsTest">
-            <Option name="vmParam" value="-cp" />
-            <Option name="vmParam"
-                value="$TestSuiteRoot$FileSeparatorbin$FileSeparatorclasses$PathSeparator$TestSuiteRoot$FileSeparatorbin$FileSeparatorlib$FileSeparatorjndi$FileSeparatorproviders.jar" />
             <Option name="PROVIDER_URL" value="$DNS_PROVIDER_URL" />
         </Param>
     </Runner>

Modified: harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/api/javax/naming/provider/rmi/functional.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/api/javax/naming/provider/rmi/functional.xml?view=diff&rev=553064&r1=553063&r2=553064
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/api/javax/naming/provider/rmi/functional.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/api/javax/naming/provider/rmi/functional.xml Tue Jul  3 21:13:40 2007
@@ -66,18 +66,13 @@
     <Source name="../../NamingTest.java" />
 
     <Runner ID="Runtime">
-
+        <Option name="-cp" value="$TestSuiteClassRoot$PathSeparator$TestSuiteLibRoot$FileSeparatorjndi$FileSeparatorproviders.jar" />
         <Param name="toRun"
             value="org.apache.harmony.test.func.api.javax.naming.NamingTest">
-            <Option name="vmParam" value="-cp" />
-            <Option name="vmParam"
-                value="$TestSuiteRoot$FileSeparatorbin$FileSeparatorclasses$PathSeparator$TestSuiteRoot$FileSeparatorbin$FileSeparatorlib$FileSeparatorjndi$FileSeparatorproviders.jar" />
             <Option name="xmlPath"
                 value="org/apache/harmony/test/func/api/javax/naming/share/jndiRMITest.xml" />
             <Option name="testName" value="own_SP" />
-
         </Param>
-
     </Runner>
 
     <Restriction name="OtherVMOnly" />

Modified: harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jit/HLO/devirt/Runtime/RuntimeExtend1/RuntimeExtend1.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jit/HLO/devirt/Runtime/RuntimeExtend1/RuntimeExtend1.xml?view=diff&rev=553064&r1=553063&r2=553064
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jit/HLO/devirt/Runtime/RuntimeExtend1/RuntimeExtend1.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jit/HLO/devirt/Runtime/RuntimeExtend1/RuntimeExtend1.xml Tue Jul  3 21:13:40 2007
@@ -41,7 +41,7 @@
         <Source name="RuntimeExtend1.java"/>
         <Runner ID="Runtime">
             <Param name="toRun" value="org.apache.harmony.test.func.jit.HLO.devirt.Runtime.RuntimeExtend1.RuntimeExtend1">
-            <Option value="$TestSuiteRoot/src/test/org/apache/harmony/test/func/jit/HLO/devirt/Runtime/RuntimeExtend1/auxiliary"/>
+            <Option value="$TestDirectory/auxiliary"/>
             </Param>
         </Runner>
 </Test>

Modified: harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/reg/jit/btest5942/Btest5942.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/reg/jit/btest5942/Btest5942.xml?view=diff&rev=553064&r1=553063&r2=553064
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/reg/jit/btest5942/Btest5942.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/reg/jit/btest5942/Btest5942.xml Tue Jul  3 21:13:40 2007
@@ -43,7 +43,7 @@
         <Param name="toRun" value="crash">
             <Option name="~opt"/>
             <Option name="org.apache.harmony.test.func.reg.jit.btest5942.Btest5942"/>
-            <Option name="$TestSuiteRoot/bin/classes/org/apache/harmony/test/func/reg/jit/btest5942/Test5942"/>
+            <Option name="$TestSuiteClassRoot/org/apache/harmony/test/func/reg/jit/btest5942/Test5942"/>
         </Param>
     </Runner>
 

Modified: harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/reg/vm/btest4492/Btest4492.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/reg/vm/btest4492/Btest4492.xml?view=diff&rev=553064&r1=553063&r2=553064
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/reg/vm/btest4492/Btest4492.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/reg/vm/btest4492/Btest4492.xml Tue Jul  3 21:13:40 2007
@@ -32,7 +32,7 @@
             <Option name="-showversion"/>
             <Option name="-cp" value="$CP"/>
             <Option name="org.apache.harmony.test.func.reg.vm.btest4492.Btest4492"/>
-            <Option name="$TestSuiteRoot/bin/classes/org/apache/harmony/test/func/reg/vm/btest4492/tmp.class"/>
+            <Option name="$TestSuiteClassRoot/org/apache/harmony/test/func/reg/vm/btest4492/tmp.class"/>
         </Param>
     </Runner>
 

Modified: harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/vm/cli/Xjit/Xjit03/Xjit03.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/vm/cli/Xjit/Xjit03/Xjit03.xml?view=diff&rev=553064&r1=553063&r2=553064
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/vm/cli/Xjit/Xjit03/Xjit03.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/vm/cli/Xjit/Xjit03/Xjit03.xml Tue Jul  3 21:13:40 2007
@@ -30,7 +30,7 @@
         <Runner ID="Execute">       
             <Param name="toRun" value="$TestedRuntime">
                 <Option name="-cp" value="$CP"/>
-                <Option name="-Xjit fromfile=$TestSuiteRoot/src/test/share/xjit.opts"/>
+                <Option name="-Xjit fromfile=$TestSuiteTestRoot/share/xjit.opts"/>
                 <Option name="CommonTest"/>
             </Param>        
         </Runner>                               

Modified: harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/vm/cli/Xtrace/Xtrace03/Xtrace03.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/vm/cli/Xtrace/Xtrace03/Xtrace03.xml?view=diff&rev=553064&r1=553063&r2=553064
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/vm/cli/Xtrace/Xtrace03/Xtrace03.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/vm/cli/Xtrace/Xtrace03/Xtrace03.xml Tue Jul  3 21:13:40 2007
@@ -30,7 +30,7 @@
         <Runner ID="Execute">       
             <Param name="toRun" value="$TestedRuntime">
                 <Option name="-Xtrace:native"/>
-                <Option value="-Djava.library.path=$TestSuiteRoot$FileSeparatorbin$FileSeparatorlib"/>
+                <Option value="-Djava.library.path=$TestSuiteLibRoot"/>
                 <Option name="-cp" value="$CP"/>
                 <Option name="TestJNI"/>
             </Param>        

Modified: harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/vm/cli/Xverbose/Xverbose03/Xverbose03.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/vm/cli/Xverbose/Xverbose03/Xverbose03.xml?view=diff&rev=553064&r1=553063&r2=553064
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/vm/cli/Xverbose/Xverbose03/Xverbose03.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/vm/cli/Xverbose/Xverbose03/Xverbose03.xml Tue Jul  3 21:13:40 2007
@@ -30,7 +30,7 @@
         <Runner ID="Execute">       
             <Param name="toRun" value="$TestedRuntime">
                 <Option name="-Xverbose:jni"/>
-                <Option value="-Djava.library.path=$TestSuiteRoot$FileSeparatorbin$FileSeparatorlib"/>
+                <Option value="-Djava.library.path=$TestSuiteLibRoot"/>
                 <Option name="-cp" value="$CP"/>
                 <Option name="TestJNI"/>
             </Param>        

Modified: harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/vm/cli/Xverbose/Xverbose08/Xverbose08.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/vm/cli/Xverbose/Xverbose08/Xverbose08.xml?view=diff&rev=553064&r1=553063&r2=553064
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/vm/cli/Xverbose/Xverbose08/Xverbose08.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/vm/cli/Xverbose/Xverbose08/Xverbose08.xml Tue Jul  3 21:13:40 2007
@@ -32,7 +32,7 @@
         <Runner ID="Execute">       
             <Param name="toRun" value="$TestedRuntime">
                 <Option name="-Xverbose:jni:$TempStorage/xverbose08.log"/>
-                <Option value="-Djava.library.path=$TestSuiteRoot$FileSeparatorbin$FileSeparatorlib"/>
+                <Option value="-Djava.library.path=$TestSuiteLibRoot"/>
                 <Option name="-cp" value="$CP"/>
                 <Option name="TestJNI"/>
             </Param>        

Modified: harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/vm/cli/Xverboselog/Xverboselog05/Xverboselog05.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/vm/cli/Xverboselog/Xverboselog05/Xverboselog05.xml?view=diff&rev=553064&r1=553063&r2=553064
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/vm/cli/Xverboselog/Xverboselog05/Xverboselog05.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/vm/cli/Xverboselog/Xverboselog05/Xverboselog05.xml Tue Jul  3 21:13:40 2007
@@ -31,7 +31,7 @@
         <Runner ID="Execute">       
             <Param name="toRun" value="$TestedRuntime">
                 <Option name="-Xverbose:jni -Xverboselog:$TempStorage/Xverboselog05.log"/>
-                <Option value="-Djava.library.path=$TestSuiteRoot$FileSeparatorbin$FileSeparatorlib"/>
+                <Option value="-Djava.library.path=$TestSuiteLibRoot"/>
                 <Option name="-cp" value="$CP"/>
                 <Option name="CommonTest"/>
             </Param>        

Modified: harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/vm/cli/Xwarn/Xwarn03/Xwarn03.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/vm/cli/Xwarn/Xwarn03/Xwarn03.xml?view=diff&rev=553064&r1=553063&r2=553064
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/vm/cli/Xwarn/Xwarn03/Xwarn03.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/vm/cli/Xwarn/Xwarn03/Xwarn03.xml Tue Jul  3 21:13:40 2007
@@ -31,7 +31,7 @@
         <Runner ID="Execute">       
             <Param name="toRun" value="$TestedRuntime">
                 <Option name="-Xwarn:jni"/>
-                <Option value="-Djava.library.path=$TestSuiteRoot$FileSeparatorbin$FileSeparatorlib"/>
+                <Option value="-Djava.library.path=$TestSuiteLibRoot"/>
                 <Option name="-cp" value="$CP"/>
                 <Option name="TestJNI"/>
             </Param>        

Modified: harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/vm/cli/Xwarn/Xwarn08/Xwarn08.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/vm/cli/Xwarn/Xwarn08/Xwarn08.xml?view=diff&rev=553064&r1=553063&r2=553064
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/vm/cli/Xwarn/Xwarn08/Xwarn08.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/vm/cli/Xwarn/Xwarn08/Xwarn08.xml Tue Jul  3 21:13:40 2007
@@ -32,7 +32,7 @@
         <Runner ID="Execute">       
             <Param name="toRun" value="$TestedRuntime">
                 <Option name="-Xwarn:jni:$TempStorage/xwarn08.log"/>
-                <Option value="-Djava.library.path=$TestSuiteRoot$FileSeparatorbin$FileSeparatorlib"/>
+                <Option value="-Djava.library.path=$TestSuiteLibRoot"/>
                 <Option name="-cp" value="$CP"/>
                 <Option name="TestJNI"/>
             </Param>        

Modified: harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/vm/cli/verbose/verbose04/verbose04.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/vm/cli/verbose/verbose04/verbose04.xml?view=diff&rev=553064&r1=553063&r2=553064
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/vm/cli/verbose/verbose04/verbose04.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/vm/cli/verbose/verbose04/verbose04.xml Tue Jul  3 21:13:40 2007
@@ -32,7 +32,7 @@
         <Runner ID="Execute">       
             <Param name="toRun" value="$TestedRuntime">
                 <Option name="-verbose:jni"/>
-                <Option value="-Djava.library.path=$TestSuiteRoot$FileSeparatorbin$FileSeparatorlib"/>                
+                <Option value="-Djava.library.path=$TestSuiteLibRoot"/>                
                 <Option name="-cp" value="$CP"/>
                 <Option name="TestJNI"/>
             </Param>