diff options
| author | elmot <elmot@vaadin.com> | 2016-04-13 15:01:50 +0300 |
|---|---|---|
| committer | elmot <elmot@vaadin.com> | 2016-04-13 15:32:47 +0300 |
| commit | 980f879176696906c25e985e4f7c8e3bdc04258d (patch) | |
| tree | d781a70e24eef0994ba5d371280e1cf837f94825 /uitest/build.xml | |
| parent | f7f5ba596dbba0c2374a6d8ac10e89362cbbaeb5 (diff) | |
| parent | 9b46608f6c645c4289b854e2949bae3b1a2f5147 (diff) | |
| download | vaadin-framework-980f879176696906c25e985e4f7c8e3bdc04258d.tar.gz vaadin-framework-980f879176696906c25e985e4f7c8e3bdc04258d.zip | |
Merge branch 'master' into feature/mavenize
Change-Id: Id7db526d07a14ac259cbb50415bbafd2a7c2ab94
Diffstat (limited to 'uitest/build.xml')
| -rw-r--r-- | uitest/build.xml | 35 |
1 files changed, 3 insertions, 32 deletions
diff --git a/uitest/build.xml b/uitest/build.xml index 6f28986d22..281d3707e9 100644 --- a/uitest/build.xml +++ b/uitest/build.xml @@ -194,23 +194,10 @@ <ant antfile="${uitest.dir}/vaadin-server.xml" target="wait-for-startup" /> - <!-- Run all different kinds of TestBench tests in parallel --> - <parallel> - - <!-- Legacy TestBench 2 tests --> - <sequential> - <ant antfile="${uitest.dir}/test.xml" - target="tb2-tests" /> - <echo message="TestBench 2 tests complete" /> - </sequential> - <!-- TestBench 3 tests --> - <sequential> - <ant antfile="${uitest.dir}/tb3test.xml" - target="run-all-tb3-tests" inheritall="true" /> - <echo message="TestBench 3 tests complete" /> - </sequential> - </parallel> + <ant antfile="${uitest.dir}/tb3test.xml" + target="run-all-tb3-tests" inheritall="true" /> + <echo message="TestBench 3 tests complete" /> </sequential> </parallel> </target> @@ -233,22 +220,6 @@ </parallel> </target> - <target name="test-tb2" depends="clean-testbench-errors"> - <property name="war.file" - location="${vaadin.basedir}/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}/vaadin-server.xml" - target="wait-for-startup" /> - <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="${vaadin.basedir}/uitest/result/lib/vaadin-uitest-${vaadin.version}.war" /> |