summaryrefslogtreecommitdiffstats
path: root/build.xml
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2012-09-05 15:30:12 +0300
committerArtur Signell <artur@vaadin.com>2012-09-09 11:23:28 +0300
commit2084a950c2f144016f2d64111c418f97e371b200 (patch)
tree465e1fe62e98025459f0a36d4d051625c3763de1 /build.xml
parent360037c2c54130cffb6b7cbaf71488609d1ba57d (diff)
downloadvaadin-framework-2084a950c2f144016f2d64111c418f97e371b200.tar.gz
vaadin-framework-2084a950c2f144016f2d64111c418f97e371b200.zip
Run TestBench tests from mani tests target (#9299)
Diffstat (limited to 'build.xml')
-rw-r--r--build.xml9
1 files changed, 6 insertions, 3 deletions
diff --git a/build.xml b/build.xml
index 85a7ed547a..ce8123fa25 100644
--- a/build.xml
+++ b/build.xml
@@ -34,11 +34,14 @@
</target>
<target name="tests" depends="buildorder">
- <subant buildpathref="build-path" target="tests">
- </subant>
+ <parallel>
+ <subant buildpathref="build-path" target="tests">
+ </subant>
+ <subant antfile="test/uitest.xml" target="test-package" />
+ </parallel>
</target>
- <target name="official.build.checks" if="official.build">
+ <target name="official.build.checks" if="build.release">
<condition property="java.version.matches">
<equals arg1="${ant.java.version}" arg2="${vaadin.java.version}" />
</condition>