Pass correct system properties to test target

diff --git a/uitest/integration_tests.xml b/uitest/integration_tests.xml
index 0b57594a972b7fb74b5951d6087bb882f4f8ca07..48b1656bcb0c8ebf48b6e1a6df078005ffd570e3 100644 (file)
--- a/uitest/integration_tests.xml
+++ b/uitest/integration_tests.xml
@@ -444,7 +444,8 @@
                             
                             <property name="com.vaadin.testbench.lib.dir" value="${com.vaadin.testbench.lib.dir}" />
                             <property name="com.vaadin.testbench.tester.host" value="${com.vaadin.testbench.tester.host}" />
-                            <property name="com.vaadin.testbench.deployment.url" value="${deployment.url}" />
+                            <property name="com.vaadin.testbench.deployment.url" value="http://${target-host}:${target-port}" />
+                            <property name="server-name" value="${target-server}" />
                         </subant>                            
                     </antcontrib:else>
                 </antcontrib:if>

diff --git a/uitest/test.xml b/uitest/test.xml
index c84225cd2c3344a8e8d9590416be4b3264d32e21..9b57b2d19f7bf6651caf39d7884b0227c83e4392 100644 (file)
--- a/uitest/test.xml
+++ b/uitest/test.xml
@@ -88,11 +88,12 @@
 
     <target name="run-tb3-tests">
         <echo>Test.xml started</echo>
-        
+
         <property name="junit.test.suite" value="com.vaadin.tests.tb3.AllTB3Tests" />
         <property name="com.vaadin.testbench.deployment.hostname" value="auto" />
         <property name="com.vaadin.testbench.deployment.url" value="" />
-        
+        <property name="server-name" value="" />
+
         <ivy:resolve file="uitest/ivy.xml" conf="build, build-provided" />
         <ivy:cachepath pathid="classpath.compile.dependencies" conf="build, build-provided" />
 
@@ -104,8 +105,11 @@
 
             <jvmarg value="-Dcom.vaadin.testbench.tester.host=${com.vaadin.testbench.tester.host}" />
             <jvmarg value="-Dcom.vaadin.testbench.deployment.hostname=${com.vaadin.testbench.deployment.hostname}" />
+
+            <!-- special parameters used when running integration tests -->
             <jvmarg value="-Ddeployment.url=${com.vaadin.testbench.deployment.url}" />
-            
+            <jvmarg value="-Dserver-name=${server-name}" />
+
             <!-- Define where the reference screenshots and diff files are 
                     saved -->
             <jvmarg value="-Dcom.vaadin.testbench.screenshot.directory=${com.vaadin.testbench.screenshot.directory}" />