[Bigdata-commit] SF.net SVN: bigdata:[4616] branches/QUADS_QUERY_BRANCH

[<tho...@us...>]

Revision: 4616
          http://bigdata.svn.sourceforge.net/bigdata/?rev=4616&view=rev
Author:   thompsonbry
Date:     2011-06-03 13:19:28 +0000 (Fri, 03 Jun 2011)

Log Message:
-----------
Back ported logic to enable CI without services.

Modified Paths:
--------------
    branches/QUADS_QUERY_BRANCH/build.properties
    branches/QUADS_QUERY_BRANCH/build.xml

Modified: branches/QUADS_QUERY_BRANCH/build.properties
===================================================================
--- branches/QUADS_QUERY_BRANCH/build.properties	2011-06-03 13:16:31 UTC (rev 4615)
+++ branches/QUADS_QUERY_BRANCH/build.properties	2011-06-03 13:19:28 UTC (rev 4616)
@@ -28,6 +28,13 @@
 #javac.source=1.6
 javac.encoding=Cp1252
 
+# Set to false to NOT start services (zookeeper, lookup server, class server, etc).
+# When false, tests which depend on those services will not run. (This can also be
+# set by CI if you leave if undefined here.)  For example:
+# export skipTestServices=true
+# ant -DskipTestServices=${skipTestServices} ...
+#skipTestServices=false
+
 ##
 # Properties for creating a release.
 ##
@@ -380,5 +387,6 @@
 # CI properties. These must agree with the actual installation directory and zoo.cfg
 # file for the zookeeper instance used to run CI.
 test.zookeeper.installDir=/Users/bryan/zookeeper-3.2.1
+#test.zookeeper.installDir=/usr/java/zookeeper-3.2.1
 test.zookeeper.tickTime=2000
 test.zookeeper.clientPort=2081

Modified: branches/QUADS_QUERY_BRANCH/build.xml
===================================================================
--- branches/QUADS_QUERY_BRANCH/build.xml	2011-06-03 13:16:31 UTC (rev 4615)
+++ branches/QUADS_QUERY_BRANCH/build.xml	2011-06-03 13:19:28 UTC (rev 4616)
@@ -1637,26 +1637,45 @@
       <!-- Issue stop on zookeeper first since zkServer leaves a pid file   -->
       <!-- around if the JVM is killed. That pid file needs to be cleaned   -->
       <!-- up before we can start a new instance.                           -->
-      <antcall target="stopZookeeper" />
+      <!--
+      <antcall target="stopZookeeper"/>
       <antcall target="stopLookup" />
       <antcall target="stopHttpd" />
-      
-      <antcall target="startZookeeper" />
-      <antcall target="startHttpd" />
-      <antcall target="startLookup" />
-
+  	  	
+      <antcall target="startZookeeper"/>
+      <antcall target="startHttpd"/>
+      <antcall target="startLookup"/>
+	  -->
       <!-- Run the tests -->
+  	  <antcall target="stopTestServices"/>
+  	  <antcall target="startTestServices"/>
       <antcall target="run-junit" />
-
+	  <antcall target="stopTestServices"/>
+      <!--
       <antcall target="stopLookup" />
       <antcall target="stopHttpd" />
       <antcall target="stopZookeeper" />
+	  -->
 
       <!-- This message is noticed by the hudson build and is used to trigger
            after various after actions. -->
       <echo>JUNIT RUN COMPLETE</echo>
     </target>
 
+	<target name="stopTestServices" unless="${skipTestServices}">
+		  <echo message="Stopping test services."/>
+	      <antcall target="stopZookeeper"/>
+	      <antcall target="stopLookup" />
+	      <antcall target="stopHttpd" />
+	</target>
+
+	<target name="startTestServices" unless="${skipTestServices}">
+		  <echo message="Starting test services."/>
+	      <antcall target="startZookeeper"/>
+	      <antcall target="startHttpd"/>
+	      <antcall target="startLookup"/>
+	</target>
+	
     <target name="startHttpd">
       <echo>java -jar ${dist.lib}/classserver.jar -verbose -stoppable -port ${test.codebase.port} -dir ${test.codebase.dir}
 </echo>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.