From: Marko Grönroos <magi@iki.fi>
Date: Wed, 21 Apr 2010 23:35:28 +0000 (+0000)
Subject: Don't run tests if server does not start. Fixes #3780.
X-Git-Tag: 6.7.0.beta1~1710^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=fa29940ad16e912f3faeef9b096573cd91be3f4c;p=vaadin-framework.git

Don't run tests if server does not start. Fixes #3780.

svn changeset:12742/svn branch:6.3
---

diff --git a/tests/test.xml b/tests/test.xml
index 92b3ad8b76..fd2f262e84 100644
--- a/tests/test.xml
+++ b/tests/test.xml
@@ -36,7 +36,7 @@
 	</fileset>
 
 	<!-- This target converts HTML tests files to java junit tests. One test file for each browser is created. -->
-	<target name="create-tests" depends="remove-temp-testclasses">
+	<target name="create-tests" depends="remove-temp-testclasses" if="server.start.succeeded">
 		<fileset id="tests">
 			<include />
 		</fileset>
@@ -105,7 +105,7 @@
 		<fail unless="com.vaadin.testbench.deployment.url" message="The 'com.vaadin.testbench.deployment.url' property must be defined." />
 	</target>
 
-	<target name="run-tests" depends="compile-tests">
+	<target name="run-tests" depends="compile-tests" if="server.start.succeeded">
 		<foreach maxthreads="20" parallel="true" target="execute-tests" param="target">
 			<path>
 				<fileset dir="${test-output-dir}" includes="**/**.java" />
@@ -164,7 +164,9 @@
 	<!-- ================================================================== -->
 
 	<!-- The default target. -->
-	<target name="run-and-clean-up" depends="check-parameters,remove-error-screens,run-tests,remove-temp-testclasses">
+	<target name="run-and-clean-up"
+            depends="check-parameters,remove-error-screens,run-tests,remove-temp-testclasses"
+            if="server.start.succeeded">
 	</target>
 
 	<!-- Also starts the server. -->