ZOOKEEPER-361. integrate cppunit testing as part of hudson patch process. (giri via mahadev)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/zookeeper/trunk@764673 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -84,6 +84,9 @@ mahadev)
   ZOOKEEPER-343. add tests that specifically verify the zkmain and 
 qpmain classes. (phunt via mahadev)
 
+  ZOOKEEPER-361. integrate cppunit testing as part of hudson patch 
+process. (giri via mahadev)
+
 NEW FEATURES:
 
 

build.xml

@@ -597,6 +597,17 @@
     	</exec>
     </target>
 
+    <target name="call-test-cppunit" description="to execute cppunit tests">
+	<antcall target="create-cppunit-configure">
+		<param name="cppunit" value="true"/>
+        </antcall>
+	<antcall target="create-cppunit-makefile"/>
+	<antcall target="test-cppunit">
+		<param name="cppunit" value="true"/>
+	</antcall>
+    </target>			
+
+
     <target name="test-cppunit" depends="compile_jute, jar, create-cppunit-makefile" if="cppunit" 
 		description="to run cppunit test cases">
         <property name="fuser.bin" value="/sbin"/>
@@ -638,7 +649,7 @@
 	<!-- yet to implement -->
     </target>
     
-    <target name="test-core" depends="test-init,test-category,junit.run"/> 
+    <target name="test-core" depends="test-init, test-category, junit.run, call-test-cppunit"/> 
 
     <!-- ====================================================== -->
     <!-- Run optional third-party tool targets                  -->

src/c/tests/TestZookeeperInit.cc

@@ -78,7 +78,7 @@ public:
 
     void testBasic()
     {
-    	const string EXPECTED_HOST("localhost:2121");
+    	const string EXPECTED_HOST("127.0.0.1:2121");
     	const int EXPECTED_ADDRS_COUNT =1;
     	const int EXPECTED_RECV_TIMEOUT=10000;
         clientid_t cid;

src/c/tests/zkServer.sh

@@ -24,7 +24,12 @@ fi
 
 if [ "x$1" == "xstartClean" ]
 then
-	rm -rf /tmp/zkdata
+    if [ "x${base_dir}" == "x" ]	
+    then
+    rm -rf /tmp/zkdata
+    else
+    rm -rf ${base_dir}/build/tmp
+    fi
 fi
 
 # Make sure nothing is left over from before
@@ -32,12 +37,13 @@ fuser -skn tcp 22181/tcp
 
 case $1 in
 start|startClean)
-	mkdir -p /tmp/zkdata
 	if [ "x${base_dir}" == "x" ]
         then
-        java -cp ../../zookeeper-dev.jar:../../src/java/lib/log4j-1.2.15.jar:../../conf org.apache.zookeeper.server.ZooKeeperServerMain 22181 /tmp/zkdata &> /tmp/zk.log &
+      	mkdir -p /tmp/zkdata
+	java -cp ../../zookeeper-dev.jar:../../src/java/lib/log4j-1.2.15.jar:../../conf org.apache.zookeeper.server.ZooKeeperServerMain 22181 /tmp/zkdata &> /tmp/zk.log &
         else
-        java -cp ${base_dir}/zookeeper-dev.jar:${base_dir}/src/java/lib/log4j-1.2.15.jar:${base_dir}/conf org.apache.zookeeper.server.ZooKeeperServerMain 22181 /tmp/zkdata &> /tmp/zk.log &
+        mkdir -p ${base_dir}/build/tmp/zkdata
+        java -cp ${base_dir}/zookeeper-dev.jar:${base_dir}/src/java/lib/log4j-1.2.15.jar:${base_dir}/conf org.apache.zookeeper.server.ZooKeeperServerMain 22181 ${base_dir}/build/tmp/zkdata &> ${base_dir}/build/tmp/zk.log &
 	fi
         sleep 5
 	;;