Index: build/unittest.sh
===================================================================
diff -u -r5d2b6fbcabc3635ae0f269d4e05583991a2da614 -r4221e195297452930cc636e283f8e74b5457e8fe
--- build/unittest.sh	(.../unittest.sh)	(revision 5d2b6fbcabc3635ae0f269d4e05583991a2da614)
+++ build/unittest.sh	(.../unittest.sh)	(revision 4221e195297452930cc636e283f8e74b5457e8fe)
@@ -39,6 +39,7 @@
 REPORT_DIR="$timeStamp-BuildNo-$buildNumber-$buildPlan"
 REPORT=Report
 LOG=Logs
+UNITTEST_RESULT=0
 
 export PATH=$PATH:$QT_DIR/bin/:$QT_DIR/lib
 export PATH=$COCO_DIR/wrapper/bin/:$COCO_DIR/bin/:$PATH
@@ -74,7 +75,7 @@
 /usr/bin/make LINK=csg++ AR=csar CXX=csg++ CC=csgcc -j4 1>../$REPORT/$LOG/build_for_QtTest.log 2>../$REPORT/$LOG/build_for_QtTest.err
 /usr/bin/make clean
 ./$DENALI_QTTEST -o -,txt 1>../$REPORT/$LOG/QtTest.log 2>../$REPORT/$LOG/QtTest.err
-cp ../$REPORT/$LOG/QtTest.log ../$REPORT/UnitTest/QtTest.txt
+UNITTEST_RESULT=$((UNITTEST_RESULT+$?))
 fi
 
 echo " ------------------------------ Squish : Configure The Project for Coverage"
@@ -87,11 +88,12 @@
 
 echo " ------------------------------ Starting the Squish Server"
 $SQUISH_DIR/bin/squishserver --config addAUT $DENALI_SQUISH $(pwd)/$BUID_DIR/ 1>$REPORT/$LOG/squishqtserver.log 2>$REPORT/$LOG/squishqtserver.err
-$SQUISH_DIR/bin/squishserver 1>>$REPORT/$LOG/squishqtserver.log 2>>$REPORT/$LOG/squishqtserver.err & #--port=$SQUISH_SERVER_PORT 
+$SQUISH_DIR/bin/squishserver 1>>$REPORT/$LOG/squishqtserver.log 2>>$REPORT/$LOG/squishqtserver.err &
 
 echo " ------------------------------ Starting tests"
-$SQUISH_DIR/bin/squishrunner --testsuite testsuites --exitCodeOnFail 13 --reportgen html,$REPORT/UnitTest 1>$REPORT/$LOG/squishqtrunner.log 2>$REPORT/$LOG/squishqtrunner.err
-UNITTEST_RESULT=$?
+$SQUISH_DIR/bin/squishrunner --testsuite testsuites --exitCodeOnFail 10000 --reportgen html,$REPORT/UnitTest 1>$REPORT/$LOG/squishqtrunner.log 2>$REPORT/$LOG/squishqtrunner.err
+cp $REPORT/$LOG/QtTest.log $REPORT/UnitTest/QtTest.txt
+UNITTEST_RESULT=$((UNITTEST_RESULT+$?))
 
 echo " ------------------------------ Merging the excecution report databases"
 cmmerge -o $BUID_DIR/denali.csmes $BUID_DIR/$DENALI_SQUISH.csmes $BUID_DIR/$DENALI_QTTEST.csmes 1>$REPORT/$LOG/cmmerge.log 2>$REPORT/$LOG/cmmerge.err
@@ -109,7 +111,7 @@
 sync;sync;sync;
 
 echo " ------------------------------ Stoping the Squish Server"
-$SQUISH_DIR/bin/squishserver --stop #--port=$SQUISH_SERVER_PORT 
+$SQUISH_DIR/bin/squishserver --stop
 if [ -z "$StopOnUnitTestError" ]; then
     exit $UNITTEST_RESULT
 else