diff options
| author | Artur Signell <artur.signell@itmill.com> | 2011-03-18 07:55:38 +0000 |
|---|---|---|
| committer | Artur Signell <artur.signell@itmill.com> | 2011-03-18 07:55:38 +0000 |
| commit | 76fc61fa6322619db96c8478de058fd8d1d42d8b (patch) | |
| tree | b08817ede9392509a0bf01967dfb46bbfc1163af /tests/integration_tests.xml | |
| parent | 067f41fe09e5994301b153fa5023044b5bda25dd (diff) | |
| download | vaadin-framework-76fc61fa6322619db96c8478de058fd8d1d42d8b.tar.gz vaadin-framework-76fc61fa6322619db96c8478de058fd8d1d42d8b.zip | |
Merged eXo integration test, minor test and build fixes from 6.5
svn changeset:17833/svn branch:6.6
Diffstat (limited to 'tests/integration_tests.xml')
| -rw-r--r-- | tests/integration_tests.xml | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/tests/integration_tests.xml b/tests/integration_tests.xml index 5d9da5583e..f1f16d1243 100644 --- a/tests/integration_tests.xml +++ b/tests/integration_tests.xml @@ -294,6 +294,23 @@ </subant>
</target>
+ <target name="integration-test-eXo-3">
+ <fileset dir="integration-testscripts" id="html-test-files" includes="eXo-3/eXo-integration.html" />
+ <pathconvert pathsep=" " property="test-gatein" refid="html-test-files" />
+
+ <subant target="run-tests" failonerror="false" antfile="test.xml">
+ <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="server.start.succeeded" value="1" />
+ <property name="browsers" value="winxp-firefox36" />
+ <property name="testfiles" value="${test-gatein}" />
+ <property name="test-output-dir" value="../build/integration-test-output" />
+
+ <fileset dir="." includes="test.xml" />
+ </subant>
+ </target>
+
<target name="integration-test-start-liferay-5">
<sshexec host="${test.integration.server}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} start-liferay-5.2.3" />
</target>
@@ -326,6 +343,14 @@ <sshexec host="${test.integration.server}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} stop-gatein-3.1.0" />
</target>
+ <target name="integration-test-start-eXo-3">
+ <sshexec host="${test.integration.server}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} start-eXo-3.0.3" />
+ </target>
+
+ <target name="integration-test-stop-eXo-3">
+ <sshexec host="${test.integration.server}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} stop-eXo-3.0.3" />
+ </target>
+
<!-- Run sampler deployment test for WebLogic server -->
<target name="integration-test-test-weblogic">
<fileset dir="integration-testscripts" id="html-test-files" includes="integration-test-${server-name}-sampler.html" />
@@ -508,6 +533,12 @@ <antcall target="integration-test-stop-gatein-3" />
</target>
+ <target name="integration-test-eXo3">
+ <antcall target="integration-test-start-eXo-3" />
+ <antcall target="integration-test-eXo-3" />
+ <antcall target="integration-test-stop-eXo-3" />
+ </target>
+
<target name="integration-test-weblogic9">
<antcall target="integration-test-start-weblogic9"/>
<antcall target="integration-test-test-weblogic">
@@ -585,6 +616,9 @@ <param name="target-server" value="gatein3"/>
</antcall>
<antcall target="run-integration-test">
+ <param name="target-server" value="eXo3"/>
+ </antcall>
+ <antcall target="run-integration-test">
<param name="target-server" value="weblogic9"/>
</antcall>
<antcall target="run-integration-test">
|