summaryrefslogtreecommitdiffstats
path: root/uitest/integration_tests.xml
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2014-02-04 23:12:38 +0200
committerVaadin Code Review <review@vaadin.com>2014-02-10 21:39:45 +0000
commitaf96612a13c372f8f0884dde76df7d671503004f (patch)
tree55e70911e7a1aed3dc3ba3b80d8baaa81e1f0b7a /uitest/integration_tests.xml
parent98aff2bc7af51b4c26b4b137f5971e8bdb0917c0 (diff)
downloadvaadin-framework-af96612a13c372f8f0884dde76df7d671503004f.tar.gz
vaadin-framework-af96612a13c372f8f0884dde76df7d671503004f.zip
Test using Tomcat 7 behind Apache proxy (#13302)
Change-Id: I725990a16b8f4fd6021044aff15c922c0c0f7bd2
Diffstat (limited to 'uitest/integration_tests.xml')
-rw-r--r--uitest/integration_tests.xml7
1 files changed, 7 insertions, 0 deletions
diff --git a/uitest/integration_tests.xml b/uitest/integration_tests.xml
index 9f639b9cb5..112a349eca 100644
--- a/uitest/integration_tests.xml
+++ b/uitest/integration_tests.xml
@@ -133,6 +133,12 @@
<param name="target-server" value="tomcat7" />
</antcall>
</target>
+ <target name="integration-test-tomcat7apacheproxy">
+ <antcall target="run-generic-integration-test">
+ <param name="startDelay" value="10" />
+ <param name="target-server" value="tomcat7apacheproxy" />
+ </antcall>
+ </target>
<target name="integration-test-tomcat8">
<antcall target="run-generic-integration-test">
<param name="startDelay" value="10" />
@@ -424,6 +430,7 @@
<antcall target="integration-test-tomcat6" />
<antcall target="integration-test-tomcat7" />
<antcall target="integration-test-tomcat8" />
+ <antcall target="integration-test-tomcat7apacheproxy" />
<antcall target="integration-test-websphere8" />
</parallel>