[Yanel-commits] rev 47717 - public/yanel/trunk/src/build/targets/continuous-integration

[guillaume at wyona.com]

Author: guillaume
Date: 2010-02-23 13:02:44 +0100 (Tue, 23 Feb 2010)
New Revision: 47717

Modified:
   public/yanel/trunk/src/build/targets/continuous-integration/CI
   public/yanel/trunk/src/build/targets/continuous-integration/reCI
Log:
Now all the Yanel tests (including the HTTPUnit and JUnit ones) are only run if a Canoo WebTest installation directory was specified:
 for some reason these tests started to fail when run inside the NAZ job since build #840 2010-02-15 23:21:29
 and running them for each project does not really bring us anything anyway...


Modified: public/yanel/trunk/src/build/targets/continuous-integration/CI
===================================================================
--- public/yanel/trunk/src/build/targets/continuous-integration/CI	2010-02-23 11:53:50 UTC (rev 47716)
+++ public/yanel/trunk/src/build/targets/continuous-integration/CI	2010-02-23 12:02:44 UTC (rev 47717)
@@ -1,7 +1,7 @@
 #!/bin/sh
 
-if [ $# -ne 5 ]; then
-	echo "Usage: CI <HTTP port> <HTTPS port> <SHUTDOWN port> <AJP port> <Canoo webtest path>"
+if [ $# -lt 4 ]; then
+	echo "Usage: CI <HTTP port> <HTTPS port> <SHUTDOWN port> <AJP port> [<Canoo webtest path>]"
 	exit 2
 fi
 set -ex
@@ -42,6 +42,8 @@
 
 ./yanel.sh start
 
+#XXX HACK: all the Yanel tests (including the HTTPUnit and JUnit ones) are only run if a Canoo WebTest installation directory was specified:
+ if [ -n "$WEBTEST_HOME_DIR" ]; then
 cat > src/test/htmlunit/local.htmlunit-properties.xml <<EOF #FIXME: do this in a portable way
 <config>
   <htmlunit>
@@ -56,6 +58,7 @@
 # Also see src/build/targets/test.xml
 ./build.sh test -Dwebtest.home.dir=$WEBTEST_HOME_DIR -Dwebtest.config.host=localhost -Dwebtest.config.protocol=http -Dwebtest.config.port=$HTTP_PORT -Dheadless=
 #TODO: test the resources from scratch
+ fi
 
 ./yanel.sh stop
 

Modified: public/yanel/trunk/src/build/targets/continuous-integration/reCI
===================================================================
--- public/yanel/trunk/src/build/targets/continuous-integration/reCI	2010-02-23 11:53:50 UTC (rev 47716)
+++ public/yanel/trunk/src/build/targets/continuous-integration/reCI	2010-02-23 12:02:44 UTC (rev 47717)
@@ -6,8 +6,8 @@
 # disabled because of http://bugzilla.wyona.com/cgi-bin/bugzilla/show_bug.cgi?id=6893 unfortunately:
 #BUILD_ID=dontKillMe
 
-if [ $# -ne 5 ]; then
-	echo "Usage: CI <HTTP port> <HTTPS port> <SHUTDOWN port> <AJP port> <Canoo webtest path>"
+if [ $# -lt 4 ]; then
+	echo "Usage: CI <HTTP port> <HTTPS port> <SHUTDOWN port> <AJP port> [<Canoo webtest path>]"
 	exit 2
 fi
 set -ex
@@ -51,6 +51,8 @@
 
 ./yanel.sh start
 
+#XXX HACK: all the Yanel tests (including the HTTPUnit and JUnit ones) are only run if a Canoo WebTest installation directory was specified:
+ if [ -n "$WEBTEST_HOME_DIR" ]; then
 cat > src/test/htmlunit/local.htmlunit-properties.xml <<EOF #FIXME: do this in a portable way
 <config>
   <htmlunit>
@@ -65,6 +67,7 @@
 # Also see src/build/targets/test.xml
 ./build.sh test -Dwebtest.home.dir=$WEBTEST_HOME_DIR -Dwebtest.config.host=localhost -Dwebtest.config.protocol=http -Dwebtest.config.port=$HTTP_PORT -Dheadless=
 #TODO: test the resources from scratch
+ fi
 
 # Yanel is always stopped at the beginning of this script, so we do not need to do it here:
-#  this allows anyone to play with the servers between jobs.
+#  this may allow anyone to play with the servers between script invocations.