diff options
| author | Artur Signell <artur@vaadin.com> | 2012-08-31 13:54:26 +0300 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2012-09-09 11:23:04 +0300 |
| commit | d8a5f96b36946ed315dcf48cc32701e0435bdfaa (patch) | |
| tree | f7fcf075a47430a9f45cfda652d91f576e32c98c /client | |
| parent | eef56b04b46c6ad202beef58c342dbb5ea0e4f5d (diff) | |
| download | vaadin-framework-d8a5f96b36946ed315dcf48cc32701e0435bdfaa.tar.gz vaadin-framework-d8a5f96b36946ed315dcf48cc32701e0435bdfaa.zip | |
Support running JUnit tests (#9299)
Diffstat (limited to 'client')
| -rw-r--r-- | client/build.xml | 6 | ||||
| -rw-r--r-- | client/ivy.xml | 7 |
2 files changed, 11 insertions, 2 deletions
diff --git a/client/build.xml b/client/build.xml index 09c22ab36e..de1b5444a8 100644 --- a/client/build.xml +++ b/client/build.xml @@ -19,6 +19,7 @@ --> <fileset file="${gwt.user.jar}" /> </path> + <path id="classpath.tests.custom" /> <target name="jar"> <antcall target="common.jar"> @@ -33,4 +34,9 @@ <target name="clean"> <antcall target="common.clean" /> </target> + + <target name="tests"> + <antcall target="common.tests.run" /> + </target> + </project>
\ No newline at end of file diff --git a/client/ivy.xml b/client/ivy.xml index 8e8c5d0ef4..26c271fe22 100644 --- a/client/ivy.xml +++ b/client/ivy.xml @@ -10,23 +10,26 @@ <conf name="build" /> <conf name="build-provided" /> <conf name="ide" /> + <conf name="tests" /> </configurations> <publications> <artifact></artifact> </publications> - <dependencies defaultconf="build" defaultconfmapping="build,ide->master"> + <dependencies defaultconf="build" defaultconfmapping="build,ide->default"> <!-- API DEPENDENCIES --> <!-- LIBRARY DEPENDENCIES (compile time) --> <!-- Project modules --> <dependency org="com.vaadin" name="vaadin-shared" - rev="${vaadin.version}" conf="build->build"></dependency> + rev="${vaadin.version}" conf="build,tests->build"></dependency> <dependency org="com.vaadin" name="vaadin-server" rev="${vaadin.version}" conf="build->build"></dependency> <!-- gwt-user dependencies --> <dependency org="org.w3c.css" name="sac" rev="1.3" /> + <dependency org="junit" name="junit" rev="4.5" + conf="tests->default" /> </dependencies> </ivy-module> |