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

[guillaume at wyona.com]

Author: guillaume
Date: 2009-03-26 11:02:38 +0100 (Thu, 26 Mar 2009)
New Revision: 42174

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:
Canoo does not care about the value of the "wt.headless" property, only about its presence!

Issue: 42168


Modified: public/yanel/trunk/src/build/build.properties
===================================================================
--- public/yanel/trunk/src/build/build.properties	2009-03-26 09:57:39 UTC (rev 42173)
+++ public/yanel/trunk/src/build/build.properties	2009-03-26 10:02:38 UTC (rev 42174)
@@ -1,4 +1,4 @@
-# --------------------------------------------------------------------------
+ --------------------------------------------------------------------------
 # Build Properties
 #
 # IMPORTANT: Do not edit this file, but rather make a local copy local.build.properties
@@ -102,8 +102,8 @@
 target.java.version=1.5
 
 
-# Is a GUI unavailable?
-headless=false
+# Is a GUI unavailable? (any defined value will prevent use of a GUI)
+#headless=
 
 
 #Testing

Modified: public/yanel/trunk/src/build/targets/continuous-integration/CI
===================================================================
--- public/yanel/trunk/src/build/targets/continuous-integration/CI	2009-03-26 09:57:39 UTC (rev 42173)
+++ public/yanel/trunk/src/build/targets/continuous-integration/CI	2009-03-26 10:02:38 UTC (rev 42174)
@@ -41,7 +41,7 @@
   </htmlunit>
 </config>
 EOF
-./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
+./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 -Dheadless=
 #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-26 09:57:39 UTC (rev 42173)
+++ public/yanel/trunk/src/build/targets/test.xml	2009-03-26 10:02:38 UTC (rev 42174)
@@ -17,7 +17,10 @@
       <propertyset>
         <propertyref prefix="webtest.config."/>
       </propertyset>
-      <property name="wt.headless" value="${headless}"/>
+      <propertyset>
+        <propertyref name="headless"/>
+        <mapper type="glob" from="*" to="wt.*"/>
+      </propertyset>
       <fileset dir="../.." includes="src/realms/**/canoo/build.xml"/>
     </subant>
   </target>