Browse Source

Extracted integration-test target.

Change-Id: I08722f298d295365c48e00ee04d40541b3a71de8
tags/7.1.13
Sauli Tähkäpää 10 years ago
parent
commit
f6bd40d2eb
1 changed files with 9 additions and 5 deletions
  1. 9
    5
      build.xml

+ 9
- 5
build.xml View File

@@ -46,19 +46,23 @@
</target>

<target name="test-all" depends="buildorder">
<property name="war.file" location="result/artifacts/${vaadin.version}/vaadin-uitest/vaadin-uitest-${vaadin.version}.war" />

<parallel>
<!-- JUnit tests, can be run without a server -->
<subant buildpathref="build-path" target="test" />

<!-- Server deployment + TestBench tests -->
<ant antfile="uitest/build.xml" target="test-testbench">
<property name="war.file" location="${war.file}" />
</ant>
<antcall target="integration-test" />
</parallel>
</target>

<target name="integration-test" depends="buildorder">
<property name="war.file" location="result/artifacts/${vaadin.version}/vaadin-uitest/vaadin-uitest-${vaadin.version}.war" />

<ant antfile="uitest/build.xml" target="test-testbench">
<property name="war.file" location="${war.file}" />
</ant>
</target>

<target name="official.build.checks" if="build.release">
<condition property="java.version.matches">
<equals arg1="${ant.java.version}" arg2="${vaadin.java.version}" />

Loading…
Cancel
Save