diff options
| author | Sauli Tähkäpää <sauli@vaadin.com> | 2014-05-20 11:05:45 +0300 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2014-05-21 12:18:27 +0000 |
| commit | 314cc68e5d5024b8cabd3dd9efb20ff4847bdebf (patch) | |
| tree | 6bd905d518d290304dff8966838bd94c9d4d493d /uitest/build.xml | |
| parent | b179103e8fd82d8b67d87799290e2d5f6aa62ff1 (diff) | |
| download | vaadin-framework-314cc68e5d5024b8cabd3dd9efb20ff4847bdebf.tar.gz vaadin-framework-314cc68e5d5024b8cabd3dd9efb20ff4847bdebf.zip | |
Fix WAR file location in uitest build scripts.
Change-Id: I0febbbaf85374c395454c889c36add277ca9b131
Diffstat (limited to 'uitest/build.xml')
| -rw-r--r-- | uitest/build.xml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/uitest/build.xml b/uitest/build.xml index 8479063ba0..84f44a2d72 100644 --- a/uitest/build.xml +++ b/uitest/build.xml @@ -17,7 +17,7 @@ </path> <target name="dependencies"> - <!-- This is copied from common.xml to be able to add server.test.source + <!-- This is copied from common.xml to be able to add server.test.source to the source path --> <ivy:resolve log="download-only" resolveid="common" conf="build, build-provided" /> @@ -161,7 +161,7 @@ <sequential> <!-- Server tests --> - <!-- Sleep before running integration tests so testbench 2 + <!-- Sleep before running integration tests so testbench 2 tests have time to compile and start --> <sleep minutes="4" /> <ant antfile="${uitest.dir}/integration_tests.xml" target="integration-test-all" inheritall="false" inheritrefs="false"> @@ -192,7 +192,7 @@ </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" /> + <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" /> @@ -206,7 +206,7 @@ </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" /> + <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" /> @@ -219,7 +219,7 @@ </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" /> + <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" /> |