diff options
| author | Artur Signell <artur@vaadin.com> | 2012-01-31 15:33:01 +0200 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2012-01-31 15:33:01 +0200 |
| commit | c1f26940cd893dc5e89d2c6eb39d83ce668557fe (patch) | |
| tree | cbe03a6cba732d0bcb1ddce2ece938dd07165489 /tests/integration_tests.xml | |
| parent | 1d01f9204bd760789592238be039acef57616109 (diff) | |
| parent | b1ae3cd70e2ca4656bb28f77ca79fe0efd29dd67 (diff) | |
| download | vaadin-framework-c1f26940cd893dc5e89d2c6eb39d83ce668557fe.tar.gz vaadin-framework-c1f26940cd893dc5e89d2c6eb39d83ce668557fe.zip | |
Merged 'b1ae3cd70e2ca4656bb28f77ca79fe0efd29dd67' (origin/6.8)
Conflicts:
WebContent/release-notes.html
tests/server-side/com/vaadin/tests/server/LicenseInJavaFiles.java
Diffstat (limited to 'tests/integration_tests.xml')
| -rw-r--r-- | tests/integration_tests.xml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/integration_tests.xml b/tests/integration_tests.xml index 1b37347ddd..6572de59eb 100644 --- a/tests/integration_tests.xml +++ b/tests/integration_tests.xml @@ -131,6 +131,7 @@ <target name="integration-test-jetty8">
<antcall target="run-generic-integration-test">
+ <param name="startDelay" value="300" />
<param name="target-server" value="jetty8" />
</antcall>
</target>
@@ -259,6 +260,7 @@ </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" />
<pathconvert pathsep=" " property="testfiles" refid="html-test-files" />
|