diff options
| author | Marko Grönroos <magi@iki.fi> | 2010-04-21 23:38:24 +0000 |
|---|---|---|
| committer | Marko Grönroos <magi@iki.fi> | 2010-04-21 23:38:24 +0000 |
| commit | 885edea880149624aeda6a689009c133989ef99d (patch) | |
| tree | f41c8e59135c00feddc4793e8594359a9e7ea668 | |
| parent | ff8432f16183b728233d1df08bb9758f0b607654 (diff) | |
| parent | fa29940ad16e912f3faeef9b096573cd91be3f4c (diff) | |
| download | vaadin-framework-885edea880149624aeda6a689009c133989ef99d.tar.gz vaadin-framework-885edea880149624aeda6a689009c133989ef99d.zip | |
Merged [12742] from 6.3 to 6.4: Don't run tests if server does not start. Fixes #3780.
svn changeset:12743/svn branch:6.4
| -rw-r--r-- | tests/test.xml | 8 |
1 files changed, 5 insertions, 3 deletions
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. --> |