harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smish...@apache.org
Subject svn commit: r522489 - in /harmony/enhanced/buildtest/trunk/modules: Apache-Tomcat5.5/ Apache-Tomcat5.5/build.xml Apache-Tomcat5.5/project.template drlvm/project.template
Date Mon, 26 Mar 2007 11:29:24 GMT
Author: smishura
Date: Mon Mar 26 04:29:24 2007
New Revision: 522489

URL: http://svn.apache.org/viewvc?view=rev&rev=522489
Log:
Integrate Apache Tomcat unit tests to build-and-test infra. Type 'ant -Dmodules=Apache-Tomcat5.5
setup' to run them under CC

Problems:
1) ecj*.jar conflict with ANT_HOME/lib: resolved by setting compiler="modern" for jasper
2) no property to set jvm for running tests: resolved by hardcoding jvm param
3) conflict with CC on port 8080: no resolution yet - tried to set port to 8081 in build/build/conf/server.xml
but it doesn't work
4) CC status is passed in case of failed unit tests: not resolved
5) notification log should be improved, currently it is useless

Added:
    harmony/enhanced/buildtest/trunk/modules/Apache-Tomcat5.5/
    harmony/enhanced/buildtest/trunk/modules/Apache-Tomcat5.5/build.xml   (with props)
    harmony/enhanced/buildtest/trunk/modules/Apache-Tomcat5.5/project.template   (with props)
Modified:
    harmony/enhanced/buildtest/trunk/modules/drlvm/project.template

Added: harmony/enhanced/buildtest/trunk/modules/Apache-Tomcat5.5/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/trunk/modules/Apache-Tomcat5.5/build.xml?view=auto&rev=522489
==============================================================================
--- harmony/enhanced/buildtest/trunk/modules/Apache-Tomcat5.5/build.xml (added)
+++ harmony/enhanced/buildtest/trunk/modules/Apache-Tomcat5.5/build.xml Mon Mar 26 04:29:24
2007
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+     
+         http://www.apache.org/licenses/LICENSE-2.0
+     
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License. 
+-->
+<project name="Apache-Tomcat5.5" default="-gen-config" basedir=".">
+
+    <import file="../../properties.xml" />
+
+    <property name="tomcat.cc" location="${target.dir}/projects/Apache-Tomcat5.5" />
+
+    <pathconvert property="base.path" dirsep="/">
+        <path path="${target.dir}/projects/Apache-Tomcat5.5" />
+    </pathconvert>
+
+    <target name="-setup">
+        <subant target="setup" buildpath="../drlvm" />
+
+        <!-- Create and configure Tomcat project -->
+        <mkdir dir="${tomcat.cc}" />
+        <get src="http://tomcat.apache.org/tomcat-5.5-doc/build.xml" dest="${tomcat.cc}/build.xml"
usetimestamp="true" verbose="true" />
+        <echo file="${tomcat.cc}/build.properties" message="base.path=${base.path}" />
+
+        <ant dir="${tomcat.cc}" target="checkout" />
+        <echo file="${tomcat.cc}/build/build.properties"> 
+base.path=${base.path}
+tester.delay=50
+            </echo>
+
+        <!-- Set compiler="modern" for jasper              -->
+        <!-- to avoid ecj*.jar conflict from $ANT_HOME/lib -->
+        <replace file="${tomcat.cc}/build/build.xml" token='&lt;jasper2' value='&lt;jasper2
compiler="modern"' />
+
+        <!-- Specify VM to run tests -->
+        <replace file="${tomcat.cc}/build/build.xml" token='fork="yes"' value='fork="yes"
jvm="../../drlvm/trunk/build/deploy/jdk/jre/bin/java"' />
+
+        <ant dir="${tomcat.cc}" />
+
+        <!-- Change Tomcat port to avoid conflict with CC -->
+        <replace file="${tomcat.cc}/build/build/conf/server.xml" token='Connector port="8080"'
value='Connector port="8081"' />
+    </target>
+
+    <target name="-gen-config">
+        <subant target="gen-config" buildpath="../drlvm" />
+
+        <process-project-template />
+    </target>
+</project>

Propchange: harmony/enhanced/buildtest/trunk/modules/Apache-Tomcat5.5/build.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: harmony/enhanced/buildtest/trunk/modules/Apache-Tomcat5.5/project.template
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/trunk/modules/Apache-Tomcat5.5/project.template?view=auto&rev=522489
==============================================================================
--- harmony/enhanced/buildtest/trunk/modules/Apache-Tomcat5.5/project.template (added)
+++ harmony/enhanced/buildtest/trunk/modules/Apache-Tomcat5.5/project.template Mon Mar 26
04:29:24 2007
@@ -0,0 +1,78 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License. 
+
+<property name="Apache-Tomcat5.5.prefix" value="[build-test alert] BUILD FAILED ${os}
${cc} ${build_cfg}: Apache-Tomcat5.5 tests"/>
+<property name="Apache-Tomcat5.5.prefix.ok" value="[build-test alert] BUILD SUCCEEDED
${os} ${cc} ${build_cfg}: Apache-Tomcat5.5 tests"/>
+
+<project name="Apache-Tomcat5.5">
+
+    <listeners>
+        <currentbuildstatuslistener file="logs/${project.name}/status.txt" />
+    </listeners>
+
+    <modificationset quietperiod="60">
+        <compound includeTriggerChanges="false">
+            <triggers>
+                <buildstatus logdir="logs/drlvm"/>
+            </triggers>
+            <targets>
+                <svn localWorkingCopy="${classlib}"/>
+                <svn localWorkingCopy="${drlvm}"/>
+            </targets>
+        </compound>
+    </modificationset>
+
+    <schedule interval="${timeout}">
+        <ant target="run-tester" antWorkingDir="projects/Apache-Tomcat5.5/build" usedebug="false"/>
+    </schedule>
+
+    <publishers>
+        <onfailure>
+            <xsltlogpublisher directory="." outfilename="tomcat.txt" xsltfile="br.xsl"
/>
+
+            <antpublisher   
+                     antworkingdir="."  
+                     buildfile="copyres.xml"  
+                     uselogger="true"  
+                     usedebug="false"  
+                     target="email.res"> 
+                <property name="file" value="tomcat.txt"/> 
+                <property name="mailhost" value="${server_addr}"/>
+                <property name="fromaddress" value="${report_from}"/>
+                <property name="toaddress" value="${report_to}"/>
+                <property name="subject" value="${Apache-Tomcat5.5.prefix}"/>
+                <property name="flag" value="${project.name}"/>
+            </antpublisher> 
+        </onfailure>
+        <onsuccess>
+            <xsltlogpublisher directory="." outfilename="tomcat.txt.ok" xsltfile="br.xsl"
/>
+
+            <antpublisher   
+                     antworkingdir="."  
+                     buildfile="copyres.xml"  
+                     uselogger="true"  
+                     usedebug="false"  
+                     target="email.res.ok"> 
+                <property name="file" value="tomcat.txt.ok"/> 
+                <property name="mailhost" value="${server_addr}"/>
+                <property name="fromaddress" value="${report_from}"/>
+                <property name="toaddress" value="${report_to}"/>
+                <property name="subject" value="${Apache-Tomcat5.5.prefix.ok}"/>
+                <property name="flag" value="${project.name}"/>
+            </antpublisher> 
+        </onsuccess>
+    </publishers>
+
+</project>

Propchange: harmony/enhanced/buildtest/trunk/modules/Apache-Tomcat5.5/project.template
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: harmony/enhanced/buildtest/trunk/modules/drlvm/project.template
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/trunk/modules/drlvm/project.template?view=diff&rev=522489&r1=522488&r2=522489
==============================================================================
--- harmony/enhanced/buildtest/trunk/modules/drlvm/project.template (original)
+++ harmony/enhanced/buildtest/trunk/modules/drlvm/project.template Mon Mar 26 04:29:24 2007
@@ -46,6 +46,7 @@
             <jvmarg arg="-D${proxy.port.vm}=${port.value}"/>
             <jvmarg arg="-Dexternal.dep.CLASSLIB.loc=${wdir}/${classlib}" />
             <jvmarg arg="-Dbuild.arch=${build_arch}" />
+            <jvmarg arg="-Ddeploy.canonical.flag=true" />
         </ant>
     </schedule>
 



Mime
View raw message