You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by va...@apache.org on 2007/08/10 12:22:57 UTC

svn commit: r564539 - in /harmony/enhanced/buildtest/branches/2.0/adaptors/eut33: adaptor.xml parameters.xml

Author: varlax
Date: Fri Aug 10 03:22:56 2007
New Revision: 564539

URL: http://svn.apache.org/viewvc?view=rev&rev=564539
Log:
Applied HARMONY-4614 [buildtest][eut] EUT3.3 does not understand -XX:vm.assert_dialog=false option

Modified:
    harmony/enhanced/buildtest/branches/2.0/adaptors/eut33/adaptor.xml
    harmony/enhanced/buildtest/branches/2.0/adaptors/eut33/parameters.xml

Modified: harmony/enhanced/buildtest/branches/2.0/adaptors/eut33/adaptor.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/adaptors/eut33/adaptor.xml?view=diff&rev=564539&r1=564538&r2=564539
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/adaptors/eut33/adaptor.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/adaptors/eut33/adaptor.xml Fri Aug 10 03:22:56 2007
@@ -33,21 +33,21 @@
             target="setup"
             inheritAll="false">
             <property name="eut.location"
-                value="${eut.parameters.optional.eut.location}" />
+                value="${eut33.parameters.optional.eut.location}" />
             <property name="eut.filename"
-                value="${eut.parameters.optional.eut.filename}" />
+                value="${eut33.parameters.optional.eut.filename}" />
             <property name="eclipse.location"
-                value="${eut.parameters.optional.eclipse.location}" />
+                value="${eut33.parameters.optional.eclipse.location}" />
             <property name="eclipse.filename.prefix"
-                value="${eut.parameters.optional.eclipse.filename.prefix}" />
+                value="${eut33.parameters.optional.eclipse.filename.prefix}" />
             <property name="eclipse.buildid"
-                value="${eut.parameters.optional.eclipse.buildid}" />
+                value="${eut33.parameters.optional.eclipse.buildid}" />
             <property name="work.dir"
                 value="${checkouts.dir}/${suite.name}"/>
             <property name="result.dir"
                 value="${results.dir}/${suite.name}"/>
             <property name="test.jre.home"
-                value="${eut.parameters.required.tested.runtime}"/>
+                value="${eut33.parameters.required.tested.runtime}"/>
         </ant>
     </target>
 
@@ -58,49 +58,49 @@
             target="run"
             inheritAll="false">
             <property name="eut.location"
-                value="${eut.parameters.optional.eut.location}" />
+                value="${eut33.parameters.optional.eut.location}" />
             <property name="eut.filename"
-                value="${eut.parameters.optional.eut.filename}" />
+                value="${eut33.parameters.optional.eut.filename}" />
             <property name="eclipse.location"
-                value="${eut.parameters.optional.eclipse.location}" />
+                value="${eut33.parameters.optional.eclipse.location}" />
             <property name="eclipse.filename.prefix"
-                value="${eut.parameters.optional.eclipse.filename.prefix}" />
+                value="${eut33.parameters.optional.eclipse.filename.prefix}" />
             <property name="eclipse.buildid"
-                value="${eut.parameters.optional.eclipse.buildid}" />
+                value="${eut33.parameters.optional.eclipse.buildid}" />
             <property name="timeout"
-                value="${eut.parameters.optional.timeout}" />
+                value="${eut33.parameters.optional.timeout}" />
             <property name="work.dir"
                 value="${checkouts.dir}/${suite.name}"/>
             <property name="result.dir"
                 value="${results.dir}/${suite.name}"/>
             <propertyset id="ws.id">
-                <propertyref name="eut.parameters.optional.ws"/>
-                <mapper type="glob" from="eut.parameters.optional.ws" to="ws"/>
+                <propertyref name="eut33.parameters.optional.ws"/>
+                <mapper type="glob" from="eut33.parameters.optional.ws" to="ws"/>
             </propertyset>
             <propertyset id="tests.id">
-                <propertyref name="eut.parameters.optional.tests"/>
-                <mapper type="glob" from="eut.parameters.optional.tests" to="tests"/>
+                <propertyref name="eut33.parameters.optional.tests"/>
+                <mapper type="glob" from="eut33.parameters.optional.tests" to="tests"/>
             </propertyset>
             <propertyset id="cvs_user.id">
-                <propertyref name="eut.parameters.optional.cvs_user"/>
-                <mapper type="glob" from="eut.parameters.optional.cvs_user" to="cvs_user"/>
+                <propertyref name="eut33.parameters.optional.cvs_user"/>
+                <mapper type="glob" from="eut33.parameters.optional.cvs_user" to="cvs_user"/>
             </propertyset>
             <propertyset id="cvs_password.id">
-                <propertyref name="eut.parameters.optional.cvs_password"/>
-                <mapper type="glob" from="eut.parameters.optional.cvs_password" to="cvs_password"/>
+                <propertyref name="eut33.parameters.optional.cvs_password"/>
+                <mapper type="glob" from="eut33.parameters.optional.cvs_password" to="cvs_password"/>
             </propertyset>
             <propertyset id="cvs_host.id">
-                <propertyref name="eut.parameters.optional.cvs_host"/>
-                <mapper type="glob" from="eut.parameters.optional.cvs_host" to="cvs_host"/>
+                <propertyref name="eut33.parameters.optional.cvs_host"/>
+                <mapper type="glob" from="eut33.parameters.optional.cvs_host" to="cvs_host"/>
             </propertyset>
             <propertyset id="cvs_root.id">
-                <propertyref name="eut.parameters.optional.cvs_root"/>
-                <mapper type="glob" from="eut.parameters.optional.cvs_root" to="cvs_root"/>
+                <propertyref name="eut33.parameters.optional.cvs_root"/>
+                <mapper type="glob" from="eut33.parameters.optional.cvs_root" to="cvs_root"/>
             </propertyset>
             <property name="vm.options"
-                value="${eut.parameters.optional.tested.vm.options}"/>
+                value="${eut33.parameters.optional.tested.vm.options}"/>
             <property name="test.jre.home"
-                value="${eut.parameters.required.tested.runtime}"/>
+                value="${eut33.parameters.required.tested.runtime}"/>
         </ant>
    </target>
 
@@ -108,4 +108,3 @@
         <!-- Not implemented -->
     </target>
 </project>
-

Modified: harmony/enhanced/buildtest/branches/2.0/adaptors/eut33/parameters.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/adaptors/eut33/parameters.xml?view=diff&rev=564539&r1=564538&r2=564539
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/adaptors/eut33/parameters.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/adaptors/eut33/parameters.xml Fri Aug 10 03:22:56 2007
@@ -33,7 +33,7 @@
     <optional>
         <tested.vm.options
             description="Options to pass to JVM under test"
-            value="-showversion -Xmx1024m -XX:vm.assert_dialog=false"/>
+            value="-showversion -Xmx1024m"/>
         <eut.location
             description="URL to fetch Eclipse Unit Tests archive"
             value="http://download.eclipse.org/eclipse/downloads/drops/R-3.3-200706251500/"/>
@@ -67,5 +67,5 @@
     </optional>
 
     <!-- CC specific configuration -->
-    <cc summary="${checkouts.dir}/eut/report.txt"/>
+    <cc summary="${checkouts.dir}/eut33/report.txt"/>
 </parameters>