summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorArtur Signell <artur.signell@itmill.com>2011-03-18 07:55:38 +0000
committerArtur Signell <artur.signell@itmill.com>2011-03-18 07:55:38 +0000
commit76fc61fa6322619db96c8478de058fd8d1d42d8b (patch)
treeb08817ede9392509a0bf01967dfb46bbfc1163af /build
parent067f41fe09e5994301b153fa5023044b5bda25dd (diff)
downloadvaadin-framework-76fc61fa6322619db96c8478de058fd8d1d42d8b.tar.gz
vaadin-framework-76fc61fa6322619db96c8478de058fd8d1d42d8b.zip
Merged eXo integration test, minor test and build fixes from 6.5
svn changeset:17833/svn branch:6.6
Diffstat (limited to 'build')
-rw-r--r--build/build.xml6
1 files changed, 3 insertions, 3 deletions
diff --git a/build/build.xml b/build/build.xml
index 36f00ad63f..232c175dfb 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -1159,9 +1159,9 @@
<target name="tests" depends="compile-java, internal-package-war">
<!-- Run all different types of tests in parallel to decrease testing time -->
<parallel threadcount="3">
- <antcall target="integration-tests"></antcall>
- <antcall target="testbench-tests"></antcall>
- <antcall target="server-side-tests"></antcall>
+ <antcall inheritrefs="true" inheritall="true" target="integration-tests"></antcall>
+ <antcall inheritrefs="true" inheritall="true" target="testbench-tests"></antcall>
+ <antcall inheritrefs="true" inheritall="true" target="server-side-tests"></antcall>
</parallel>
</target>