[jboss-cvs] JBossAS SVN: r69559 - trunk/testsuite.

[jboss-cvs-commits at lists.jboss.org]

Author: akostadinov
Date: 2008-02-03 05:59:04 -0500 (Sun, 03 Feb 2008)
New Revision: 69559

Modified:
   trunk/testsuite/build.xml
Log:
as part of JBAS-2235 - check generated tests.log if any servers failed to shutdown so build is marked as failed

Modified: trunk/testsuite/build.xml
===================================================================
--- trunk/testsuite/build.xml	2008-02-03 01:42:32 UTC (rev 69558)
+++ trunk/testsuite/build.xml	2008-02-03 10:59:04 UTC (rev 69559)
@@ -877,7 +877,7 @@
    -->
    <target name="tests" description="Execute all non-benchmark tests."
       depends="maybejars">
-      <record name="${basedir}/build.log" append="no" action="start" loglevel="${buildlog.level}"/>
+      <record name="output/tests.log" append="no" action="start" loglevel="info"/>
       <property name="nojars" value="true"/>
       <antcall target="jboss-minimal-tests" />
       <antcall target="jboss-all-config-tests"/>
@@ -901,7 +901,20 @@
       <antcall target="tests-aop-scoped"/>
       <antcall target="tests-classloader-leak"/>
       <antcall target="tests-report"/>
-      <record name="${basedir}/build.log" action="stop"/>
+      <record name="output/tests.log" action="stop"/>
+      <condition property="servers.shutdown.failed">
+         <and>
+            <not><isset property="servers.shutdown.nocheck"/></not>
+            <isfileselected file="output/tests.log">
+               <or>
+                  <contains text="Unable to shutdown server properly"/>
+                  <not><contains text="[server:stop]"/></not>
+               </or>
+            </isfileselected>
+         </and>
+      </condition>
+      <fail message="Some servers failed to shutdown cleanly."
+         if="servers.shutdown.failed"/>
    </target>
 
    <target name="tests-stress" description="Execute all stress tests."