diff options
| author | Artur Signell <artur@vaadin.com> | 2013-09-16 14:31:37 +0300 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2013-09-24 05:36:15 +0000 |
| commit | a682e3b5341e5cf21e84c1dbbb2bc98743674392 (patch) | |
| tree | 4e700896af7d80634d1838d3965f5312832c7d6e /build.xml | |
| parent | 6b17abed4cbf3aff19efd58c5f3ca6195972f39e (diff) | |
| download | vaadin-framework-a682e3b5341e5cf21e84c1dbbb2bc98743674392.tar.gz vaadin-framework-a682e3b5341e5cf21e84c1dbbb2bc98743674392.zip | |
Refactored build scripts to support TB2, TB3 + integration tests (#12572)
* Main build configuration triggers unit tests for all modules and uitest/build.xml testbench tests in parallel
* uitest/build.xml triggers Jetty startup and integration (server) tests in parallel. After the server has started, TB2 and TB3 tests are run in parallel.
* Server integration tests for servlet containers are run using TB3 and the com.vaadin.tests.tb3.ServletIntegrationTests test suite.
* Portlet integration tests are still run using TB2 test scripts
Change-Id: Ie6bffd4e68b4889074e9c470faa3c65f923e55c4
Diffstat (limited to 'build.xml')
| -rw-r--r-- | build.xml | 15 |
1 files changed, 6 insertions, 9 deletions
@@ -43,19 +43,16 @@ <target name="test" depends="buildorder"> <subant buildpathref="build-path" target="test" /> </target> + <target name="test-all" depends="buildorder"> <property name="war.file" location="result/artifacts/${vaadin.version}/vaadin-uitest/vaadin-uitest-${vaadin.version}.war" /> + <parallel> - <sequential> - <!-- Sleep before running integration tests so testbench - tests have time to compile and start --> - <sleep minutes="4" /> - <ant antfile="uitest/integration_tests.xml" target="integration-test-all" inheritall="false" inheritrefs="false"> - <property name="demo.war" value="${war.file}" /> - </ant> - </sequential> + <!-- JUnit tests, can be run without a server --> <subant buildpathref="build-path" target="test" /> - <ant antfile="uitest/test.xml" target="test-package"> + + <!-- Server deployment + TestBench tests --> + <ant antfile="uitest/build.xml" target="test-testbench"> <property name="war.file" location="${war.file}" /> </ant> </parallel> |