diff options
| author | Mikael Grankvist <mikael.grankvist@itmill.com> | 2009-11-24 09:32:57 +0000 |
|---|---|---|
| committer | Mikael Grankvist <mikael.grankvist@itmill.com> | 2009-11-24 09:32:57 +0000 |
| commit | 94415f5ad15f52a03d32b79243657b623d14c6b8 (patch) | |
| tree | da80b5ae68ada9a320685b38671d2ccab736d500 /build | |
| parent | ef81d11d3ed443c0aa544556a16370156e8d473d (diff) | |
| download | vaadin-framework-94415f5ad15f52a03d32b79243657b623d14c6b8.tar.gz vaadin-framework-94415f5ad15f52a03d32b79243657b623d14c6b8.zip | |
Changed key.file to sshkey.file
Changed integration-tests target to 'all'
svn changeset:9975/svn branch:6.2
Diffstat (limited to 'build')
| -rw-r--r-- | build/build.xml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/build/build.xml b/build/build.xml index 386b8bdf8d..981ed91c9a 100644 --- a/build/build.xml +++ b/build/build.xml @@ -1430,20 +1430,20 @@ <!-- Parameters for the test.xml script. --> <fail unless="com.vaadin.testbench.tester.host" message="The 'com.vaadin.testbench.tester.host' property must be defined."/> <fail unless="com.vaadin.testbench.lib.dir" message="The 'com.vaadin.testbench.lib.dir' property must be defined."/> - <fail unless="key.file" message="The 'key.file' property must be defined."/> + <fail unless="sshkey.file" message="The 'sshkey.file' property must be defined."/> <!-- Empty passphrase if no passphrase defined --> <property name="passphrase" value="" /> <!-- Run the separate test script. --> - <ant antfile="tests/integration_tests.xml" target="tomcat4" inheritall="false" inheritrefs="true"> + <ant antfile="tests/integration_tests.xml" target="all" inheritall="false" inheritrefs="true"> <!-- This is provided so that the test script can copy the --> <!-- "tests" classes after unpacking the package. --> <property name="output-dir" value="${output-dir}"/> <property name="com.vaadin.testbench.tester.host" value="${com.vaadin.testbench.tester.host}"/> <property name="com.vaadin.testbench.lib.dir" value="${com.vaadin.testbench.lib.dir}"/> - <property name="key.file" value="${key.file}" /> + <property name="sshkey.file" value="${sshkey.file}" /> <property name="passphrase" value="${passphrase}" /> <property name="demo.war" value="${result-path}/${product-file}-demo-${version.full}.war"/> </ant> |