From 2ac56631c0e30a07111ac01fa53b5665757f4131 Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Thu, 12 May 2016 20:56:08 +0300
Subject: Do not start local Jetty for server tests

Change-Id: I1ef92966108aee8ee6475df9efacc53ed9865560
---
 uitest/build.xml | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

(limited to 'uitest/build.xml')

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">
-- 
cgit v1.2.3