summaryrefslogtreecommitdiffstats
path: root/tests/integration_tests.xml
diff options
context:
space:
mode:
authorJohannes Dahlström <johannes.dahlstrom@vaadin.com>2012-01-20 10:30:03 +0000
committerJohannes Dahlström <johannes.dahlstrom@vaadin.com>2012-01-20 10:30:03 +0000
commit272923e03232e07cca23abf51618c819807122e1 (patch)
treee642a519c91205e1eb935da241841bc2c750dc10 /tests/integration_tests.xml
parent068b75f818d135e65300693bab311074745d8133 (diff)
downloadvaadin-framework-272923e03232e07cca23abf51618c819807122e1.tar.gz
vaadin-framework-272923e03232e07cca23abf51618c819807122e1.zip
Merge from 6.7
svn changeset:22729/svn branch:6.8
Diffstat (limited to 'tests/integration_tests.xml')
-rw-r--r--tests/integration_tests.xml8
1 files changed, 8 insertions, 0 deletions
diff --git a/tests/integration_tests.xml b/tests/integration_tests.xml
index 5984097880..57d6bb47a9 100644
--- a/tests/integration_tests.xml
+++ b/tests/integration_tests.xml
@@ -259,6 +259,13 @@
</antcall>
</target>
+ <target name="integration-test-weblogic12">
+ <antcall target="run-generic-integration-test">
+ <param name="target-port" value="7001" />
+ <param name="target-server" value="weblogic12" />
+ </antcall>
+ </target>
+
<target name="integration-test-weblogicPortal">
<fileset dir="integration-testscripts" id="html-test-files" includes="weblogic-portal/integration-test-WebLogic-Portal-10.3.2-portlet2.html" />
@@ -308,6 +315,7 @@
<antcall target="integration-test-liferay5" />
<antcall target="integration-test-weblogic9" />
<antcall target="integration-test-weblogic10" />
+ <!--<antcall target="integration-test-weblogic12" />-->
<antcall target="integration-test-gatein3" />
<antcall target="integration-test-glassfish2" />
<antcall target="integration-test-glassfish3" />