diff options
| author | Mikael Vappula <mikael@vaadin.com> | 2011-12-02 15:05:24 +0200 |
|---|---|---|
| committer | Mikael Vappula <mikael@vaadin.com> | 2011-12-02 15:05:24 +0200 |
| commit | c1ac1f6b1f0675dece725c5b9d04a8823335cb09 (patch) | |
| tree | 2f7eff34d3acba9e9ae2a02fedce6cfab29efa2f /tests/test.xml | |
| parent | c7af8ee743fb3c86d6d369da153ff2a2404a0181 (diff) | |
| download | vaadin-framework-c1ac1f6b1f0675dece725c5b9d04a8823335cb09.tar.gz vaadin-framework-c1ac1f6b1f0675dece725c5b9d04a8823335cb09.zip | |
Cleaned up Ivy configuration
Targets related to Ivy configuration are now in separate common.xml file
which is imported to main build files.
Diffstat (limited to 'tests/test.xml')
| -rw-r--r-- | tests/test.xml | 33 |
1 files changed, 19 insertions, 14 deletions
diff --git a/tests/test.xml b/tests/test.xml index 51d2bae3a6..5ea9547fa4 100644 --- a/tests/test.xml +++ b/tests/test.xml @@ -2,6 +2,12 @@ <project xmlns:antcontrib="antlib:net.sf.antcontrib" xmlns:ivy="antlib:org.apache.ivy.ant" name="Run Vaadin Testbench Tests" basedir="." default="run-and-clean-up"> + + <!-- Import common targets --> + <import file="../build/common.xml" /> + <!-- Import targets for server management --> + <import file="vaadin-server.xml" as="server"/> + <!-- ================================================================== --> <!-- Configuration --> <!-- ================================================================== --> @@ -28,20 +34,19 @@ <property name="com.vaadin.testbench.debug" value="false"/> <!-- Temporary output directory, created and removed by this script --> - <!-- <property name="test-output-dir" value="../build/test-output" /> --> - <fail unless="test-output-dir" message="The 'test-output-dir' property must be defined." /> - - <!-- Include targets for server management --> - <include file="vaadin-server.xml" as="server"/> + <fail unless="test-output-dir" message="The 'test-output-dir' property must be defined." /> <property name="class-dir" value="${test-output-dir}/classes" /> - <!-- classpath must include test bench jar and its dependencies --> - <!-- TODO emma--> - <path id="classpath"> - <fileset dir="${com.vaadin.testbench.lib.dir}" includes="**/*.jar" /> - <fileset dir="../build/lib" includes="emma*.jar" /> - </path> + <target name="initialize" depends="common.init-deps"> + <ivy:resolve conf="emma"/> + <ivy:cachepath pathid="emma.lib" conf="emma" /> + <!-- classpath must include test bench jar and its dependencies --> + <path id="classpath"> + <fileset dir="${com.vaadin.testbench.lib.dir}" includes="**/*.jar" /> + <path refid="emma.lib" /> + </path> + </target> <!-- fileset containing all TestBench tests to run --> <fileset dir=".." id="html-test-files"> @@ -97,6 +102,7 @@ <sequential> <antcall target="execute-tests"> <param name="target" value="@{target}" /> + <reference refid="classpath" /> </antcall> </sequential> </antcontrib:for> @@ -159,14 +165,13 @@ <!-- ================================================================== --> <!-- The default target. --> - <target name="run-and-clean-up" depends="check-parameters,remove-error-screens,run-tests"> - </target> + <target name="run-and-clean-up" depends="check-parameters,remove-error-screens,run-tests" /> <!-- Also starts the server. --> <target name="test-package"> <parallel> <daemons> - <antcall inheritall="true" inheritrefs="true" target="server.deploy-and-start" /> + <ant antfile="vaadin-server.xml" inheritall="true" inheritrefs="true" target="deploy-and-start" /> </daemons> <sequential> <antcall target="server.wait-for-startup" /> |