harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smish...@apache.org
Subject svn commit: r615166 - in /harmony/enhanced/buildtest/branches/2.0/adaptors/gut: adaptor.xml parameters.xml
Date Fri, 25 Jan 2008 10:18:08 GMT
Author: smishura
Date: Fri Jan 25 02:18:07 2008
New Revision: 615166

URL: http://svn.apache.org/viewvc?rev=615166&view=rev
Log:
Remove redundant props and params

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

Modified: harmony/enhanced/buildtest/branches/2.0/adaptors/gut/adaptor.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/adaptors/gut/adaptor.xml?rev=615166&r1=615165&r2=615166&view=diff
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/adaptors/gut/adaptor.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/adaptors/gut/adaptor.xml Fri Jan 25 02:18:07 2008
@@ -25,30 +25,15 @@
     <available property="skip.install" file="${install.marker}" />
         
     <target name="setup" unless="skip.install">
-        <description>
-            setup: Install, configure and build Geronimo and its pre-requisites
-        </description>
         <log message="============= Adaptor for ${suite.name}: Set Up ..."/>
 
         <svn-update-bt path="${test.sources.dir}/${suite.name}"/>
 
-        <exec-ant dir="${test.sources.dir}/${suite.name}"
-                  targets="setup"
-                  failonerror="true"
-                  failproperty="gut.setup.failed">
-            <sysproperty key="geronimo.location" value="${gut.parameters.optional.geronimo.location}"/>
-            <sysproperty key="geronimo.version"  value="${gut.parameters.optional.geronimo.version}"/>
-            <sysproperty key="geronimo.filename" value="${gut.parameters.optional.geronimo.filename}"/>
-            <sysproperty key="maven.location"    value="${gut.parameters.optional.maven.location}"/>
-            <sysproperty key="maven.version"     value="${gut.parameters.optional.maven.version}"/>
-            <sysproperty key="maven.filename"    value="${gut.parameters.optional.maven.filename}"/>
-            <sysproperty key="work.dir"          value="${test.sources.dir}/${suite.name}"/>
-            <sysproperty key="maven.dir"         value="${test.sources.dir}/${suite.name}"/>
+        <exec-ant dir="${test.sources.dir}/${suite.name}" targets="setup">
             <sysproperty key="result.dir"        value="${results.dir}/${suite.name}"/>
             <sysproperty key="test.jre.home"     value="${gut.parameters.required.tested.runtime}"/>
         </exec-ant>
 
-        <fail message="Geronimo unit tests setup failed" if="gut.setup.failed"/>
         <touch file="${install.marker}"/>
     </target>
 
@@ -56,24 +41,11 @@
     <target name="run" description="Run Geronimo Unit Tests">
         <log message="============= Adaptor for ${suite.name}: Run ..."/>
 
-        <exec-ant dir="${test.sources.dir}/${suite.name}"
-                  targets="run"
-                  failonerror="true"
-                  failproperty="gut.run.failed">
-            <sysproperty key="geronimo.location" value="${gut.parameters.optional.geronimo.location}"/>
-            <sysproperty key="geronimo.version"  value="${gut.parameters.optional.geronimo.version}"/>
-            <sysproperty key="geronimo.filename" value="${gut.parameters.optional.geronimo.filename}"/>
-            <sysproperty key="maven.location"    value="${gut.parameters.optional.maven.location}"/>
-            <sysproperty key="maven.version"     value="${gut.parameters.optional.maven.version}"/>
-            <sysproperty key="maven.filename"    value="${gut.parameters.optional.maven.filename}"/>
-            <sysproperty key="work.dir"          value="${test.sources.dir}/${suite.name}"/>
-            <sysproperty key="maven.dir"         value="${test.sources.dir}/${suite.name}"/>
+        <exec-ant dir="${test.sources.dir}/${suite.name}" targets="run">
             <sysproperty key="result.dir"        value="${results.dir}/${suite.name}"/>
             <sysproperty key="vm.options"        value="${gut.parameters.optional.tested.vm.options}"/>
             <sysproperty key="test.jre.home"     value="${gut.parameters.required.tested.runtime}"/>
         </exec-ant>
-
-        <fail message="Geronimo unit tests failed" if="gut.run.failed"/>
     </target>
 
     <!-- Clean Geronimo build and test results -->

Modified: harmony/enhanced/buildtest/branches/2.0/adaptors/gut/parameters.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/adaptors/gut/parameters.xml?rev=615166&r1=615165&r2=615166&view=diff
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/adaptors/gut/parameters.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/adaptors/gut/parameters.xml Fri Jan 25 02:18:07
2008
@@ -30,24 +30,6 @@
         <tested.vm.options
             description="JVM options for tested runtime"
             value=""/>
-        <geronimo.location
-            description="URL to fetch Apache Geronimo sources"
-            value="http://apache.org/dist/geronimo/2.0.2/"/>
-        <geronimo.filename
-            description="Apache Geronimo sources archive name"
-            value="geronimo-2.0.2-src.tar.gz"/>
-        <geronimo.version
-            description="Apache Geronimo version to use"
-            value="2.0.2"/>
-        <maven.location
-            description="URL to fetch Apache Maven binaries"
-            value="http://archive.apache.org/dist/maven/binaries/"/>
-        <maven.filename
-            description="Apache Maven archive name"
-            value="maven-2.0.6-bin.tar.gz"/>
-        <maven.version
-            description="Apache Maven version to use"
-            value="2.0.6"/>
     </optional>
 
     <!-- external dependencies -->



Mime
View raw message