diff options
| author | Teemu Suo-Anttila <teemusa@vaadin.com> | 2016-04-15 11:06:18 +0300 |
|---|---|---|
| committer | Teemu Suo-Anttila <teemusa@vaadin.com> | 2016-04-15 14:00:58 +0300 |
| commit | 6b8412033e680ce6e5c7827ac504adf132305726 (patch) | |
| tree | 0df05d16c324b285610af8910c126b58f4c490c5 /uitest/build.xml | |
| parent | 9192b0bb5e5e699b506b3d3e7df4cf295fbea44a (diff) | |
| download | vaadin-framework-6b8412033e680ce6e5c7827ac504adf132305726.tar.gz vaadin-framework-6b8412033e680ce6e5c7827ac504adf132305726.zip | |
Build uitest war with maven
Change-Id: I32625901ca27a282253df44c6e776cf9632bacda
Diffstat (limited to 'uitest/build.xml')
| -rw-r--r-- | uitest/build.xml | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/uitest/build.xml b/uitest/build.xml index 281d3707e9..0d22b05a9b 100644 --- a/uitest/build.xml +++ b/uitest/build.xml @@ -34,28 +34,25 @@ <fail unless="module.name" message="No module name given" /> <property name="result.dir" location="result" /> - <property name="src" location="${result.dir}/../src" /> + <property name="src" location="${result.dir}/../src/main/java" /> + <property name="test.src" location="${result.dir}/../src/test/java" /> <property name="classes" location="${result.dir}/classes" /> <property name="server.test.sources" location="${result.dir}/../../server/src/test/java" /> <mkdir dir="${classes}" /> - <!-- TODO: Get rid of this --> <javac destdir="${classes}" source="${vaadin.java.version}" target="${vaadin.java.version}" debug="true" encoding="UTF-8" includeantruntime="false"> - <src path="${server.test.sources}" /> - <include name="com/vaadin/tests/data/bean/**" /> - <include name="com/vaadin/tests/VaadinClasses.java" /> - <include - name="com/vaadin/data/util/sqlcontainer/SQLTestsConstants.java" /> + <src path="${src}" /> + <classpath location="${classes}" /> <classpath refid="classpath.compile.dependencies" /> <classpath refid="classpath.compile.custom" /> </javac> - + <javac destdir="${classes}" source="${vaadin.java.version}" target="${vaadin.java.version}" debug="true" encoding="UTF-8" includeantruntime="false"> - <src path="${src}" /> + <src path="${test.src}" /> <classpath location="${classes}" /> <classpath refid="classpath.compile.dependencies" /> <classpath refid="classpath.compile.custom" /> @@ -204,7 +201,7 @@ <target name="test-server" depends="clean-testbench-errors"> <property name="war.file" - location="${vaadin.basedir}/result/artifacts/${vaadin.version}/vaadin-uitest/vaadin-uitest-${vaadin.version}.war" /> + location="${vaadin.basedir}/uitest/target/vaadin-uitest-${vaadin.version}.war" /> <parallel> <daemons> <ant antfile="${uitest.dir}/vaadin-server.xml" @@ -220,9 +217,9 @@ </parallel> </target> - <target name="test-tb3" depends="clean-testbench-errors"> + <target name="test-tb3" depends="clean-testbench-errors,compile"> <property name="war.file" - location="${vaadin.basedir}/uitest/result/lib/vaadin-uitest-${vaadin.version}.war" /> + location="${vaadin.basedir}/uitest/target/vaadin-uitest-${vaadin.version}.war" /> <mkdir dir="${vaadin.basedir}/result" /> <parallel> <daemons> |