Author: smishura
Date: Tue Apr 24 19:35:40 2007
New Revision: 532174
URL: http://svn.apache.org/viewvc?view=rev&rev=532174
Log:
Apply patch from HARMONY-3205:
([buildtest][log] CC should merge results of all runs to the notification)
Modified:
harmony/enhanced/buildtest/trunk/build.xml
harmony/enhanced/buildtest/trunk/config/xsl/errors.xsl
harmony/enhanced/buildtest/trunk/config/xsl/unittests.xsl
harmony/enhanced/buildtest/trunk/modules/classlib-drlvm/project.template
harmony/enhanced/buildtest/trunk/modules/classlib/project.template
harmony/enhanced/buildtest/trunk/modules/drlvm-test/project.template
harmony/enhanced/buildtest/trunk/modules/drlvm/project.template
Modified: harmony/enhanced/buildtest/trunk/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/trunk/build.xml?view=diff&rev=532174&r1=532173&r2=532174
==============================================================================
--- harmony/enhanced/buildtest/trunk/build.xml (original)
+++ harmony/enhanced/buildtest/trunk/build.xml Tue Apr 24 19:35:40 2007
@@ -279,6 +279,8 @@
ttimeout=${task_timeout}
build_cfg=${build_configuration}
build_arch=${build.arch}
+os.name=${os.name}
+os.arch=${os.arch}
cc_webcontent=${target.dir}/webapps/cruisecontrol
server_addr=${mail_server}
report_to=${report_failures_to}
Modified: harmony/enhanced/buildtest/trunk/config/xsl/errors.xsl
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/trunk/config/xsl/errors.xsl?view=diff&rev=532174&r1=532173&r2=532174
==============================================================================
--- harmony/enhanced/buildtest/trunk/config/xsl/errors.xsl (original)
+++ harmony/enhanced/buildtest/trunk/config/xsl/errors.xsl Tue Apr 24 19:35:40 2007
@@ -68,7 +68,7 @@
<xsl:if test="$total.errorMessage.count > 0">
<xsl:text> *********************************************************** </xsl:text>
- <xsl:text>Errors/Warnings: </xsl:text>(<xsl:value-of select="$total.errorMessage.count"/>)
+ <xsl:text>Execution log (errors/warnings messages): </xsl:text>
<xsl:text> </xsl:text>
<xsl:if test="count($error.messages) > 0">
Modified: harmony/enhanced/buildtest/trunk/config/xsl/unittests.xsl
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/trunk/config/xsl/unittests.xsl?view=diff&rev=532174&r1=532173&r2=532174
==============================================================================
--- harmony/enhanced/buildtest/trunk/config/xsl/unittests.xsl (original)
+++ harmony/enhanced/buildtest/trunk/config/xsl/unittests.xsl Tue Apr 24 19:35:40 2007
@@ -72,11 +72,11 @@
<xsl:choose>
<xsl:when test="count($testsuite.list) = 0">
- <xsl:text>No Tests Run: This project doesn't have any tests </xsl:text>
+ <xsl:text>No Tests Run: This project doesn't have any tests or
tests were not run </xsl:text>
</xsl:when>
<xsl:when test="$totalErrorsAndFailures = 0">
- <xsl:text>All Tests Passed </xsl:text>
+ <!--xsl:text>All Tests Passed </xsl:text-->
</xsl:when>
</xsl:choose>
Modified: harmony/enhanced/buildtest/trunk/modules/classlib-drlvm/project.template
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/trunk/modules/classlib-drlvm/project.template?view=diff&rev=532174&r1=532173&r2=532174
==============================================================================
--- harmony/enhanced/buildtest/trunk/modules/classlib-drlvm/project.template (original)
+++ harmony/enhanced/buildtest/trunk/modules/classlib-drlvm/project.template Tue Apr 24 19:35:40
2007
@@ -13,8 +13,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-<property name="cl.test.prefix" value="[build-test alert] BUILD FAILED ${os} ${cc} ${build_cfg}:
classlib tests"/>
-<property name="cl.test.prefix.ok" value="[build-test alert] BUILD SUCCEEDED ${os} ${cc}
${build_cfg}: classlib tests"/>
+<property name="cl.test.prefix" value="[build-test alert] BUILD FAILED ${os.name} ${os.arch}
${cc} ${build_cfg}: classlib tests run"/>
+<property name="cl.test.prefix.ok" value="[build-test alert] BUILD SUCCEEDED ${os.name}
${os.arch} ${cc} ${build_cfg}: classlib tests run"/>
<project name="classlib-drlvm">
@@ -37,8 +37,8 @@
<schedule interval="${timeout}">
<ant target="test" antWorkingDir="${classlib}" timeout="${ttimeout}" usedebug="false">
<jvmarg arg="-Dtest.jre.home=${wdir}/${drlvm}/build/${os}_${build_arch}_${cc}_${build_cfg}/deploy/jdk/jre"
/>
- <jvmarg arg="-Dhy.test.vm.name=${tested.vm.name}" />
<jvmarg arg="-Xmx700M" />
+ <jvmarg arg="-Dexclude.interm=true" />
</ant>
</schedule>
Modified: harmony/enhanced/buildtest/trunk/modules/classlib/project.template
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/trunk/modules/classlib/project.template?view=diff&rev=532174&r1=532173&r2=532174
==============================================================================
--- harmony/enhanced/buildtest/trunk/modules/classlib/project.template (original)
+++ harmony/enhanced/buildtest/trunk/modules/classlib/project.template Tue Apr 24 19:35:40
2007
@@ -13,8 +13,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-<property name="cl.prefix" value="[build-test alert] BUILD FAILED ${os} ${cc} ${build_cfg}:
classlib " />
-<property name="cl.prefix.ok" value="[build-test alert] BUILD SUCCEEDED ${os} ${cc} ${build_cfg}:
classlib " />
+<property name="cl.prefix" value="[build-test alert] BUILD FAILED ${os.name} ${os.arch}
${cc} ${build_cfg}: classlib build" />
+<property name="cl.prefix.ok" value="[build-test alert] BUILD SUCCEEDED ${os.name} ${os.arch}
${cc} ${build_cfg}: classlib build" />
<property name="classlib" value="projects/classlib/trunk" />
@@ -37,6 +37,7 @@
<jvmarg arg="-D${proxy.host.property}=${proxy.value}" />
<jvmarg arg="-D${proxy.port.property}=${port.value}" />
<jvmarg arg="-Xmx700M" />
+ <jvmarg arg="-Dkeep.working=true" />
</ant>
</schedule>
Modified: harmony/enhanced/buildtest/trunk/modules/drlvm-test/project.template
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/trunk/modules/drlvm-test/project.template?view=diff&rev=532174&r1=532173&r2=532174
==============================================================================
--- harmony/enhanced/buildtest/trunk/modules/drlvm-test/project.template (original)
+++ harmony/enhanced/buildtest/trunk/modules/drlvm-test/project.template Tue Apr 24 19:35:40
2007
@@ -13,8 +13,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-<property name="vm.test.prefix" value="[build-test alert] BUILD FAILED ${os} ${cc} ${build_cfg}:
drlvm tests"/>
-<property name="vm.test.prefix.ok" value="[build-test alert] BUILD SUCCEEDED ${os} ${cc}
${build_cfg}: drlvm tests"/>
+<property name="vm.test.prefix" value="[build-test alert] BUILD FAILED ${os.name} ${os.arch}
${cc} ${build_cfg}: drlvm tests run"/>
+<property name="vm.test.prefix.ok" value="[build-test alert] BUILD SUCCEEDED ${os.name}
${os.arch} ${cc} ${build_cfg}: drlvm tests run"/>
<project name="drlvm-test">
@@ -39,10 +39,10 @@
<jvmarg arg="-D${proxy.port.vm}=${port.value}"/>
<jvmarg arg="-Dexternal.dep.CLASSLIB.loc=${wdir}/${classlib}" />
<jvmarg arg="-Dbuild.arch=${build_arch}" />
- <jvmarg arg="-DBUILD_CFG=${build_cfg}" />
- <jvmarg arg="-DCXX=${cc}" />
+ <jvmarg arg="-Dbuild.cfg=${build_cfg}" />
+ <jvmarg arg="-Dbuild.cxx=${cc}" />
<jvmarg arg="-Drun.all.tests=true" />
- <jvmarg arg="-Dtest.mode=jit,jet,opt,int" />
+ <jvmarg arg="-Dtest.mode=jit,jet,opt,int,srv" />
</ant>
</schedule>
@@ -51,12 +51,14 @@
<merge dir="${drlvm}/build/${os}_${build_arch}_${cc}_${build_cfg}/semis/jvmti.tests/reports/jet"
pattern="TEST-*.xml" />
<merge dir="${drlvm}/build/${os}_${build_arch}_${cc}_${build_cfg}/semis/jvmti.tests/reports/jit"
pattern="TEST-*.xml" />
<merge dir="${drlvm}/build/${os}_${build_arch}_${cc}_${build_cfg}/semis/jvmti.tests/reports/opt"
pattern="TEST-*.xml" />
+ <merge dir="${drlvm}/build/${os}_${build_arch}_${cc}_${build_cfg}/semis/jvmti.tests/reports/srv"
pattern="TEST-*.xml" />
<merge dir="${drlvm}/build/${os}_${build_arch}_${cc}_${build_cfg}/semis/vm/_cunit.tests/report"
pattern="TEST-*.xml" />
<merge dir="${drlvm}/build/${os}_${build_arch}_${cc}_${build_cfg}/semis/vm/_smoke.tests/reports"
pattern="TEST-*.xml" />
<merge dir="${drlvm}/build/${os}_${build_arch}_${cc}_${build_cfg}/semis/kernel.tests/reports/jet.mode"
pattern="TEST-*.xml" />
<merge dir="${drlvm}/build/${os}_${build_arch}_${cc}_${build_cfg}/semis/kernel.tests/reports/jit.mode"
pattern="TEST-*.xml" />
<merge dir="${drlvm}/build/${os}_${build_arch}_${cc}_${build_cfg}/semis/kernel.tests/reports/opt.mode"
pattern="TEST-*.xml" />
<merge dir="${drlvm}/build/${os}_${build_arch}_${cc}_${build_cfg}/semis/kernel.tests/reports/int.mode"
pattern="TEST-*.xml" />
+ <merge dir="${drlvm}/build/${os}_${build_arch}_${cc}_${build_cfg}/semis/kernel.tests/reports/srv.mode"
pattern="TEST-*.xml" />
</log>
<publishers>
@@ -73,7 +75,7 @@
<property name="mailhost" value="${server_addr}"/>
<property name="fromaddress" value="${report_from}"/>
<property name="toaddress" value="${report_to}"/>
- <property name="subject" value="${vm.prefix}"/>
+ <property name="subject" value="${vm.test.prefix}"/>
<property name="flag" value="${project.name}"/>
</antpublisher>
</onfailure>
@@ -90,7 +92,7 @@
<property name="mailhost" value="${server_addr}"/>
<property name="fromaddress" value="${report_from}"/>
<property name="toaddress" value="${report_to}"/>
- <property name="subject" value="${vm.prefix.ok}"/>
+ <property name="subject" value="${vm.test.prefix.ok}"/>
<property name="flag" value="${project.name}"/>
</antpublisher>
</onsuccess>
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=532174&r1=532173&r2=532174
==============================================================================
--- harmony/enhanced/buildtest/trunk/modules/drlvm/project.template (original)
+++ harmony/enhanced/buildtest/trunk/modules/drlvm/project.template Tue Apr 24 19:35:40 2007
@@ -13,8 +13,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-<property name="vm.prefix" value="[build-test alert] BUILD FAILED ${os} ${cc} ${build_cfg}:
drlvm"/>
-<property name="vm.prefix.ok" value="[build-test alert] BUILD SUCCEEDED ${os} ${cc} ${build_cfg}:
drlvm"/>
+<property name="vm.prefix" value="[build-test alert] BUILD FAILED ${os.name} ${os.arch}
${cc} ${build_cfg}: drlvm build"/>
+<property name="vm.prefix.ok" value="[build-test alert] BUILD SUCCEEDED ${os.name} ${os.arch}
${cc} ${build_cfg}: drlvm build"/>
<property name="drlvm" value="projects/drlvm/trunk" />
@@ -46,6 +46,8 @@
<jvmarg arg="-D${proxy.port.vm}=${port.value}"/>
<jvmarg arg="-Dexternal.dep.CLASSLIB.loc=${wdir}/${classlib}" />
<jvmarg arg="-Dbuild.arch=${build_arch}" />
+ <jvmarg arg="-Dbuild.cfg=${build_cfg}" />
+ <jvmarg arg="-Dbuild.cxx=${cc}" />
<jvmarg arg="-Ddeploy.canonical.flag=true" />
</ant>
</schedule>
|