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

[guillaume at wyona.com]

Author: guillaume
Date: 2009-03-25 11:56:12 +0100 (Wed, 25 Mar 2009)
New Revision: 42168

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:
Yanel bundled realms' Canoo tests can now run without needing a GUI.

Also ports can also be configured directly from the command-line.

These 2 changes make it possible to run them for continuous integration under Unix!

Issue: 6888



Modified: public/yanel/trunk/src/build/build.properties
===================================================================
--- public/yanel/trunk/src/build/build.properties	2009-03-25 00:44:09 UTC (rev 42167)
+++ public/yanel/trunk/src/build/build.properties	2009-03-25 10:56:12 UTC (rev 42168)
@@ -102,6 +102,10 @@
 target.java.version=1.5
 
 
+# Is a GUI unavailable?
+headless=false
+
+
 #Testing
 
 # JMeter home dir (needed if you want to execute jmeter test plans)

Modified: public/yanel/trunk/src/build/targets/continuous-integration/CI
===================================================================
--- public/yanel/trunk/src/build/targets/continuous-integration/CI	2009-03-25 00:44:09 UTC (rev 42167)
+++ public/yanel/trunk/src/build/targets/continuous-integration/CI	2009-03-25 10:56:12 UTC (rev 42168)
@@ -41,7 +41,7 @@
   </htmlunit>
 </config>
 EOF
-./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 -Dwebtest.config.host=localhost -Dwebtest.config.protocol=http -Dwebtest.config.port=$HTTP_PORT
+./build.sh test -Dwebtest.home.dir=/opt/canoo/webtest-3.0-R_1758 -Dwebtest.config.host=localhost -Dwebtest.config.protocol=http -Dwebtest.config.port=$HTTP_PORT
 #TODO: test the resources from scratch
 
 ./yanel.sh stop

Modified: public/yanel/trunk/src/build/targets/test.xml
===================================================================
--- public/yanel/trunk/src/build/targets/test.xml	2009-03-25 00:44:09 UTC (rev 42167)
+++ public/yanel/trunk/src/build/targets/test.xml	2009-03-25 10:56:12 UTC (rev 42168)
@@ -14,6 +14,10 @@
      failonerror="false"
     -->
       <property name="webtest.home" value="${webtest.home.dir}"/>
+      <propertyset>
+        <propertyref prefix="webtest.config."/>
+      </propertyset>
+      <property name="wt.headless" value="${headless}"/>
       <fileset dir="../.." includes="src/realms/**/canoo/build.xml"/>
     </subant>
   </target>