From e2755c499d6c42e7c590f2a0d5ad4860eb280739 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Marko=20Gr=C3=B6nroos?= <magi@iki.fi>
Date: Fri, 18 Sep 2009 14:25:26 +0000
Subject: [PATCH] Force giving testbench library directory as a parameter to
 test script.

svn changeset:8855/svn branch:6.1
---
 build/build.xml | 2 ++
 tests/test.xml  | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/build/build.xml b/build/build.xml
index 188ad458fe..329266d734 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -1262,6 +1262,7 @@
       <!-- 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.deployment.url" message="The 'com.vaadin.testbench.deployment.url' property must be defined."/>
+      <fail unless="com.vaadin.testbench.lib.dir" message="The 'com.vaadin.testbench.lib.dir' property must be defined."/>
 
       <property name="package.platform.name" value="${product-file}-${package-platform}-${version}"/>
 
@@ -1280,6 +1281,7 @@
           <property name="package.name" value="${package.platform.name}"/>
           <property name="com.vaadin.testbench.tester.host" value="${com.vaadin.testbench.tester.host}"/>
           <property name="com.vaadin.testbench.deployment.url" value="${com.vaadin.testbench.deployment.url}"/>
+          <property name="com.vaadin.testbench.lib.dir" value="${com.vaadin.testbench.lib.dir}"/>
       </ant>
     </target>
 
diff --git a/tests/test.xml b/tests/test.xml
index 7ac2aca772..91bb5d6756 100644
--- a/tests/test.xml
+++ b/tests/test.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0"?>
 
-<project name="Testing Testing Tools" basedir="." default="run-and-clean-up">
+<project name="Run Vaadin Testbench Tests" basedir="." default="run-and-clean-up">
     <!-- ================================================================== -->
     <!-- Configuration                                                      -->
     <!-- ================================================================== -->
-	<property name="lib.dir" value="../build/lib/testbench" />
 	<!-- Temporary output directory, created and removed by this script -->
 	<property name="test-output-dir" value="../build/test-output" />
 	<property name="class-dir" value="${test-output-dir}/classes" />
@@ -13,7 +12,7 @@
 	
 	<!-- classpath must include test bench jar and its dependencies -->
 	<path id="classpath">
-		<fileset dir="${lib.dir}" includes="**/*.jar" />
+		<fileset dir="${com.vaadin.testbench.lib.dir}" includes="**/*.jar" />
 	</path>
 
 	<!-- fileset containing all tests to run -->
@@ -86,6 +85,7 @@
 	
 	<target name="check-parameters">
         <fail unless="output-dir" message="The 'output-dir' (usually build/result/vaadin-xxx) should be given to test script."/>
+        <fail unless="com.vaadin.testbench.lib.dir" message="The 'com.vaadin.testbench.lib.dir' property must be defined."/>
         <fail unless="com.vaadin.testbench.tester.host" message="The 'com.vaadin.testbench.tester.host' property must be defined."/>
         <fail unless="com.vaadin.testbench.deployment.url" message="The 'com.vaadin.testbench.deployment.url' property must be defined."/>
     </target>
-- 
2.39.5