diff options
Diffstat (limited to 'test/servlet-containers/generic/build.xml')
| -rw-r--r-- | test/servlet-containers/generic/build.xml | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/test/servlet-containers/generic/build.xml b/test/servlet-containers/generic/build.xml index ee16b2c0e1..da6731ea0d 100644 --- a/test/servlet-containers/generic/build.xml +++ b/test/servlet-containers/generic/build.xml @@ -13,6 +13,9 @@ <property name="result.dir" value="result" /> <property name="result.war" location="${uitest.dir}/target/${module.name}-${vaadin.version}.war" /> + <!--todo automate version number --> + <property name="result.jboss6.war" + location="${uitest.dir}/target/${module.name}-8.0-SNAPSHOT-jboss6.war" /> <!-- Need to give a default value to keep Ivy happy --> <property name="vaadin.build.repository" value="http://maven.vaadin.com/vaadin-prereleases"/> @@ -23,12 +26,12 @@ </target> <target name="test-server" depends="clean-testbench-errors"> - <property name="war.file" location="${result.war}" /> <mkdir dir="${vaadin.basedir}/result" /> <ant antfile="integration_tests.xml" target="integration-test-all" inheritall="false" inheritrefs="false"> - <property name="demo.war" value="${war.file}" /> + <property name="demo.war" value="${result.war}" /> + <property name="demo.jboss6.war" value="${result.jboss6.war}" /> </ant> </target> |