LPS-23023

build-test-geronimo.xml

@@ -4,6 +4,8 @@
 	<import file="build-test.xml" />
 
 	<target name="run-geronimo">
+		<antcall target="clean-up-logs" />
+
 		<record action="start" name="log" />
 
 		<antcall target="run-simple-server">

build-test-glassfish.xml

@@ -4,6 +4,8 @@
 	<import file="build-test.xml" />
 
 	<target name="run-glassfish">
+		<antcall target="clean-up-logs" />
+
 		<record action="start" name="log" />
 
 		<antcall target="run-simple-server">

build-test-jboss.xml

@@ -4,6 +4,8 @@
 	<import file="build-test.xml" />
 
 	<target name="run-jboss">
+		<antcall target="clean-up-logs" />
+
 		<record action="start" name="log" />
 
 		<antcall target="run-simple-server">

build-test-jetty.xml

@@ -4,6 +4,8 @@
 	<import file="build-test.xml" />
 
 	<target name="run-jetty">
+		<antcall target="clean-up-logs" />
+
 		<record action="start" name="log" />
 
 		<antcall target="run-simple-server">

build-test-jonas.xml

@@ -4,6 +4,8 @@
 	<import file="build-test.xml" />
 
 	<target name="run-jonas">
+		<antcall target="clean-up-logs" />
+
 		<record action="start" name="log" />
 
 		<antcall target="run-simple-server">

build-test-tomcat.xml

@@ -228,6 +228,8 @@ web.server.display.node=true</echo>
 	</target>
 
 	<target name="run-tomcat">
+		<antcall target="clean-up-logs" />
+
 		<record action="start" name="log" />
 
 		<antcall target="run-simple-server">

build-test-weblogic-10.3.xml

@@ -190,6 +190,8 @@
 
 		<antcall target="start-selenium" />
 
+		<antcall target="clean-up-logs" />
+
 		<record action="start" name="log" />
 
 		<antcall target="run-weblogic-10.3">

build-test-websphere-6.1.xml

@@ -241,6 +241,8 @@ $AdminConfig save</echo>
 			<arg line="-pw ${vm.password} ${vm.username}@${vm.host} cmd.exe /c C:\Progra~1\IBM\WebSphere\AppServer\profiles\AppSrv01\bin\stopServer.bat server1" />
 		</exec>
 
+		<antcall target="clean-up-logs" />
+
 		<exec executable="${pscp.executable}">
 			<arg line="-pw ${vm.password} ${vm.username}@${vm.host}:Progra~1/IBM/WebSphere/AppServer/profiles/AppSrv01/logs/server1/SystemOut.log log" />
 		</exec>

build-test-websphere-7.0.xml

@@ -250,6 +250,8 @@ print AdminControl.invoke(appManager, 'startApplication', 'liferay-tunnel-web')<
 			<arg line="-pw ${vm.password} ${vm.username}@${vm.host} cmd.exe /c C:\Progra~1\IBM\WebSphere\AppServer\profiles\AppSrv01\bin\stopServer.bat server1" />
 		</exec>
 
+		<antcall target="clean-up-logs" />
+
 		<exec executable="${pscp.executable}">
 			<arg line="-pw ${vm.password} ${vm.username}@${vm.host}:Progra~1/IBM/WebSphere/AppServer/profiles/AppSrv01/logs/server1/SystemOut.log log" />
 		</exec>

build-test.xml

@@ -1754,6 +1754,11 @@
 		</delete>
 	</target>
 
+	<target name="clean-up-logs">
+		<delete file="log" />
+		<delete file="portal-web/test-ant-scripts/log" />
+	</target>
+
 	<target name="clean-up-java-processes">
 		<loadfile property="java.processes.old.content" srcfile="java-processes" />
 
@@ -1874,7 +1879,7 @@
 		<if>
 			<available file="portal-web/test-ant-scripts/log" />
 			<then>
-				<move file="portal-web/test-ant-scripts/log" todir="."/>
+				<move file="portal-web/test-ant-scripts/log" todir="." />
 			</then>
 		</if>
 
@@ -1902,7 +1907,7 @@
 			</then>
 		</if>
 
-		<delete file="log" />
+		<antcall target="clean-up-logs" />
 	</target>
 
 	<target name="execute-remote-command">

portal-web/test/com/liferay/portalweb/portal/evaluatelog/EvaluateLogTest.java

@@ -51,7 +51,8 @@ private boolean evaluateLog() throws Exception {
 			}
 
 			if (line.matches(
-					"The web application \\[.*\\] appears to have started")) {
+					".*The web application \\[.*\\] appears to have started " +
+					"a thread.*")) {
 
 				if (line.contains("[AWT-Windows]")) {
 					continue;