diff options
| author | Artur Signell <artur@vaadin.com> | 2016-05-12 20:56:08 +0300 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2016-05-13 11:05:30 +0000 |
| commit | 2ac56631c0e30a07111ac01fa53b5665757f4131 (patch) | |
| tree | 8787d602ba495e63529ea979fb8f88a6104a0ae1 /uitest | |
| parent | dfcc4949ca445b55bc004ef96da8ae28aa343018 (diff) | |
| download | vaadin-framework-2ac56631c0e30a07111ac01fa53b5665757f4131.tar.gz vaadin-framework-2ac56631c0e30a07111ac01fa53b5665757f4131.zip | |
Do not start local Jetty for server tests
Change-Id: I1ef92966108aee8ee6475df9efacc53ed9865560
Diffstat (limited to 'uitest')
| -rw-r--r-- | uitest/build.xml | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/uitest/build.xml b/uitest/build.xml index 335c837f5a..ab0c154ba8 100644 --- a/uitest/build.xml +++ b/uitest/build.xml @@ -31,19 +31,11 @@ <target name="test-server" depends="clean-testbench-errors"> <property name="war.file" location="${vaadin.basedir}/uitest/target/vaadin-uitest-${vaadin.version}.war" /> - <parallel> - <daemons> - <ant antfile="${uitest.dir}/vaadin-server.xml" - inheritall="true" inheritrefs="true" target="deploy-and-start" /> - </daemons> - <sequential> - <ant antfile="${uitest.dir}/integration_tests.xml" - target="integration-test-all" inheritall="false" - inheritrefs="false"> - <property name="demo.war" value="${war.file}" /> - </ant> - </sequential> - </parallel> + <ant antfile="${uitest.dir}/integration_tests.xml" + target="integration-test-all" inheritall="false" + inheritrefs="false"> + <property name="demo.war" value="${war.file}" /> + </ant> </target> <target name="test-tb3" depends="clean-testbench-errors"> |