diff options
| author | Build Agent <build@vaadin.com> | 2014-03-10 08:27:54 +0200 |
|---|---|---|
| committer | Build Agent <build@vaadin.com> | 2014-03-10 08:27:54 +0200 |
| commit | d05c628d6162dbaff32e5f779fac5b36171c6028 (patch) | |
| tree | 6f32b0ce2e4d47e91c97532d79931466ba763564 /uitest | |
| parent | 876672ed5781ab8e6778faf43e5b0de331fa54f6 (diff) | |
| parent | 1e22aaf4df18413e537731f6b2bac249022cb72e (diff) | |
| download | vaadin-framework-d05c628d6162dbaff32e5f779fac5b36171c6028.tar.gz vaadin-framework-d05c628d6162dbaff32e5f779fac5b36171c6028.zip | |
Merge changes from origin/7.1
dd5698f Revert "Fix displaced TabSheet caption icon in Chrome"
2d8ec53 Fix TabSheet caption icon alignment on Chrome and Safari (#13077)
1e22aaf Added nojavadoc parameter, test-server, test-tb2, test-tb3 targets.
Change-Id: Ibc8421d3e3c037c01f31e168ce79baf20ef61684
Diffstat (limited to 'uitest')
| -rw-r--r-- | uitest/build.xml | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/uitest/build.xml b/uitest/build.xml index 7d5ce867fe..b9bb5a4cbd 100644 --- a/uitest/build.xml +++ b/uitest/build.xml @@ -191,6 +191,44 @@ </parallel> </target> + <target name="test-server" depends="clean-testbench-errors"> + <property name="war.file" location="result/artifacts/${vaadin.version}/vaadin-uitest/vaadin-uitest-${vaadin.version}.war" /> + <parallel> + <daemons> + <ant antfile="${uitest.dir}/vaadin-server.xml" inheritall="true" inheritrefs="true" target="deploy-and-start" /> + </daemons> + <sequential> + <ant antfile="${uitest.dir}/integration_tests.xml" target="integration-test-all" inheritall="false" inheritrefs="false"> + <property name="demo.war" value="${war.file}" /> + </ant> + </sequential> + </parallel> + </target> + + <target name="test-tb2" depends="clean-testbench-errors"> + <property name="war.file" location="result/artifacts/${vaadin.version}/vaadin-uitest/vaadin-uitest-${vaadin.version}.war" /> + <parallel> + <daemons> + <ant antfile="${uitest.dir}/vaadin-server.xml" inheritall="true" inheritrefs="true" target="deploy-and-start" /> + </daemons> + <sequential> + <ant antfile="${uitest.dir}/test.xml" target="tb2-tests" /> + </sequential> + </parallel> + </target> + + <target name="test-tb3" depends="clean-testbench-errors"> + <property name="war.file" location="result/artifacts/${vaadin.version}/vaadin-uitest/vaadin-uitest-${vaadin.version}.war" /> + <parallel> + <daemons> + <ant antfile="${uitest.dir}/vaadin-server.xml" inheritall="true" inheritrefs="true" target="deploy-and-start" /> + </daemons> + <sequential> + <ant antfile="${uitest.dir}/tb3test.xml" target="run-all-tb3-tests" inheritall="true" /> + </sequential> + </parallel> + </target> + <target name="clean-testbench-errors"> <fail unless="com.vaadin.testbench.screenshot.directory" message="Define screenshot directory using -Dcom.vaadin.testbench.screenshot.directory" /> <mkdir dir="${com.vaadin.testbench.screenshot.directory}/errors" /> |