diff options
| author | Leif Åstrand <leif@vaadin.com> | 2012-04-10 12:56:39 +0300 |
|---|---|---|
| committer | Leif Åstrand <leif@vaadin.com> | 2012-04-10 12:56:39 +0300 |
| commit | a8941d2e09c6b0f5e904b60378f9b469d2d9fd9e (patch) | |
| tree | 84f3021591df5fec93f11bcf1ed140294555f81c /tests/integration_tests.xml | |
| parent | 105d563f6622256d00d580dc52cc302e7c810e56 (diff) | |
| parent | 18dd267cfe3757adee20aaae556b64746c677683 (diff) | |
| download | vaadin-framework-a8941d2e09c6b0f5e904b60378f9b469d2d9fd9e.tar.gz vaadin-framework-a8941d2e09c6b0f5e904b60378f9b469d2d9fd9e.zip | |
Merge remote branch 'origin/6.8'
Conflicts:
src/com/vaadin/terminal/gwt/client/ui/VTabsheet.java
src/com/vaadin/terminal/gwt/client/ui/VTree.java
src/com/vaadin/terminal/gwt/client/ui/VWindow.java
src/com/vaadin/ui/AbstractField.java
Diffstat (limited to 'tests/integration_tests.xml')
| -rw-r--r-- | tests/integration_tests.xml | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/tests/integration_tests.xml b/tests/integration_tests.xml index 7bb179056a..7f72758a37 100644 --- a/tests/integration_tests.xml +++ b/tests/integration_tests.xml @@ -243,6 +243,14 @@ <param name="target-server" value="weblogic9" /> </antcall> </target> + + <target name="integration-test-websphere8"> + <antcall target="run-generic-integration-test"> + <param name="startDelay" value="600" /> + <param name="target-port" value="9080" /> + <param name="target-server" value="websphere8" /> + </antcall> + </target> <target name="integration-test-weblogic10"> <antcall target="run-generic-integration-test"> @@ -323,6 +331,7 @@ <antcall target="integration-test-tomcat5" /> <antcall target="integration-test-tomcat6" /> <antcall target="integration-test-tomcat7" /> + <antcall target="integration-test-websphere8" /> </parallel> |