[Yanel-commits] rev 42077 - in public/yanel/trunk/src/build: . targets targets/continuous-integration

[guillaume at wyona.com]

Author: guillaume
Date: 2009-03-20 12:14:24 +0100 (Fri, 20 Mar 2009)
New Revision: 42077

Modified:
   public/yanel/trunk/src/build/build.properties
   public/yanel/trunk/src/build/targets/continuous-integration/CI
   public/yanel/trunk/src/build/targets/test.xml
Log:
Made running Yanel bundled realms' Canoo tests easier:
 ff you define where WebTest is installed
 the tests will be run automatically along with the JUnit and HTMLUnit tests!

Alas this is not run for continuous integration under Unix yet (no headless setup ready) so
 just added a comment about that for now.

Issue: 6888


Modified: public/yanel/trunk/src/build/build.properties
===================================================================
--- public/yanel/trunk/src/build/build.properties	2009-03-20 10:32:23 UTC (rev 42076)
+++ public/yanel/trunk/src/build/build.properties	2009-03-20 11:14:24 UTC (rev 42077)
@@ -101,11 +101,16 @@
 source.java.version=1.5
 target.java.version=1.5
 
+
 #Testing
 
 # JMeter home dir (needed if you want to execute jmeter test plans)
 jmeter.home.dir=/opt/jakarta-jmeter-2.2
 
+# WebTest home dir (needed if you want to execute WebTest-based tests, they will be skipped if this is left undefined)
+#webtest.home.dir=/opt/canoo-webtest-3.0-R_1758
+
+
 yanel.source.version=${yanel.version}-r${yanel.revision}
 yanel.conf.dir=${yanel.source.home}/conf
 yanel.local.conf.dir=${yanel.source.home}/${local.config.dir}

Modified: public/yanel/trunk/src/build/targets/continuous-integration/CI
===================================================================
--- public/yanel/trunk/src/build/targets/continuous-integration/CI	2009-03-20 10:32:23 UTC (rev 42076)
+++ public/yanel/trunk/src/build/targets/continuous-integration/CI	2009-03-20 11:14:24 UTC (rev 42077)
@@ -19,9 +19,8 @@
 
 ./yanel.sh start
 
-./build.sh test
+./build.sh test #TODO: we would need a headless setup (e.g. Xvfb) to run the Canoo tests: -Dwebtest.home.dir=/opt/canoo/webtest-3.0-R_1758
 #TODO: test the resources from scratch
-#TODO: run Canoo tests
 
 ./yanel.sh stop
 

Modified: public/yanel/trunk/src/build/targets/test.xml
===================================================================
--- public/yanel/trunk/src/build/targets/test.xml	2009-03-20 10:32:23 UTC (rev 42076)
+++ public/yanel/trunk/src/build/targets/test.xml	2009-03-20 11:14:24 UTC (rev 42077)
@@ -1,9 +1,21 @@
 <?xml version="1.0"?>
+<project name="test" default="test">
 
-<project name="test" default="test" xmlns:artifact="antlib:org.apache.maven.artifact.ant">
-
   <target name="test" description="Run tests">
     <ant dir="../test" target="test" inheritall="false"/>
+    <antcall target="test-using-webtest"/>
   </target>
+
+  <target name="test-using-webtest" if="webtest.home.dir">
+    <subant target=""
+     inheritall="false"
+    >
+    <!--
+     failonerror="false"
+    -->
+      <property name="webtest.home" value="${webtest.home.dir}"/>
+      <fileset dir="../.." includes="src/realms/**/canoo/build.xml"/>
+    </subant>
+  </target>
   
-</project>
\ No newline at end of file
+</project>