diff options
| author | Artur Signell <artur@vaadin.com> | 2015-09-04 15:05:27 +0300 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2015-09-04 15:05:27 +0300 |
| commit | f46be1b2792755cb7d9b111068dd6cf202398c4a (patch) | |
| tree | 74f7098faee688cc1f1ca1b6ffe9e912338bbcaf /uitest/integration_tests.xml | |
| parent | e603ea3cf91e5dd0893b766f27d400947527fba9 (diff) | |
| parent | ebceef4d44bcd61605fa92fcf7be8d3678537599 (diff) | |
| download | vaadin-framework-f46be1b2792755cb7d9b111068dd6cf202398c4a.tar.gz vaadin-framework-f46be1b2792755cb7d9b111068dd6cf202398c4a.zip | |
Merge remote-tracking branch 'origin/master' into reconnect-dialog
Change-Id: Ie622160a83116c83b255a26bec297f73f3223ac7
Diffstat (limited to 'uitest/integration_tests.xml')
| -rw-r--r-- | uitest/integration_tests.xml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/uitest/integration_tests.xml b/uitest/integration_tests.xml index 395627a4a7..20d0d2147d 100644 --- a/uitest/integration_tests.xml +++ b/uitest/integration_tests.xml @@ -411,7 +411,8 @@ <antcall target="integration-test-osgi" /> <antcall target="integration-test-tomcat7apacheproxy" /> <antcall target="integration-test-websphere8" /> - <antcall target="integration-test-websphereportal8" /> + <!-- Currently the test system does not have a server for automatic testing of WebSphere Portal 8 --> + <!-- <antcall target="integration-test-websphereportal8" /> --> </parallel> </target> |