diff options
| author | Mikael Grankvist <mikael.grankvist@itmill.com> | 2010-06-24 06:39:33 +0000 |
|---|---|---|
| committer | Mikael Grankvist <mikael.grankvist@itmill.com> | 2010-06-24 06:39:33 +0000 |
| commit | d125f6a3468bcd602fabf9632817f337180a2dba (patch) | |
| tree | 977fa484cef5eaa038e1a0fa9b5dedf4fb140df0 | |
| parent | 6b6663f6333f05c3fdc10bd25520d3bdf4192480 (diff) | |
| download | vaadin-framework-d125f6a3468bcd602fabf9632817f337180a2dba.tar.gz vaadin-framework-d125f6a3468bcd602fabf9632817f337180a2dba.zip | |
test-output-dir property changed to required instead of pre-filled
svn changeset:13885/svn branch:6.4
| -rw-r--r-- | tests/eclipse-run-selected-test.properties | 4 | ||||
| -rw-r--r-- | tests/integration_tests.xml | 4 | ||||
| -rw-r--r-- | tests/test.xml | 3 |
3 files changed, 9 insertions, 2 deletions
diff --git a/tests/eclipse-run-selected-test.properties b/tests/eclipse-run-selected-test.properties index 3367d011d0..49925925bc 100644 --- a/tests/eclipse-run-selected-test.properties +++ b/tests/eclipse-run-selected-test.properties @@ -24,4 +24,6 @@ com.vaadin.testbench.screenshot.cursor=true ; browsers=winxp-opera10
; Claim that the server has started succesfully. Needed for the tests to run
-server.start.succeeded=1
\ No newline at end of file +server.start.succeeded=1
+
+test-output-dir=../build/test-output
\ No newline at end of file diff --git a/tests/integration_tests.xml b/tests/integration_tests.xml index 0e364c5936..abbb189e81 100644 --- a/tests/integration_tests.xml +++ b/tests/integration_tests.xml @@ -167,6 +167,7 @@ <property name="server.start.succeeded" value="1" />
<property name="browsers" value="${test_browsers}" />
<property name="testfiles" value="${test-liferay}" />
+ <property name="test-output-dir" value="../build/integration-test-output" />
<fileset dir="." includes="test.xml" />
</subant>
@@ -184,6 +185,7 @@ <property name="server.start.succeeded" value="1" />
<property name="browsers" value="winxp-firefox36" />
<property name="testfiles" value="${init-liferay}" />
+ <property name="test-output-dir" value="../build/integration-test-output" />
<fileset dir="." includes="test.xml" />
</subant>
@@ -210,6 +212,7 @@ <property name="server.start.succeeded" value="1" />
<property name="browsers" value="${test_browsers}" />
<property name="testfiles" value="${test-weblogic}" />
+ <property name="test-output-dir" value="../build/integration-test-output" />
<fileset dir="." includes="test.xml" />
</subant>
@@ -245,6 +248,7 @@ <property name="server.start.succeeded" value="1" />
<property name="browsers" value="${test_browsers}" />
<property name="testfiles" value="${test-GAE}" />
+ <property name="test-output-dir" value="../build/integration-test-output" />
<fileset dir="." includes="test.xml" />
</subant>
diff --git a/tests/test.xml b/tests/test.xml index cd17e85022..63fe49f08d 100644 --- a/tests/test.xml +++ b/tests/test.xml @@ -14,7 +14,8 @@ <property name="com.vaadin.testbench.tester.host" value="192.168.1.48" /> <!-- Temporary output directory, created and removed by this script --> - <property name="test-output-dir" value="../build/test-output" /> + <!-- <property name="test-output-dir" value="../build/test-output" /> --> + <fail unless="test-output-dir" message="The 'test-output-dir' property must be defined." /> <property name="class-dir" value="${test-output-dir}/classes" /> <taskdef resource="net/sf/antcontrib/antlib.xml"> |