Index: build/unittest.sh
===================================================================
diff -u -rab272c9e8ed5b75aa9f17ea3df52924fbd316f4e -r7d9c33defa7ed7ddffb61c0ce8c0f8f5c5a03845
--- build/unittest.sh	(.../unittest.sh)	(revision ab272c9e8ed5b75aa9f17ea3df52924fbd316f4e)
+++ build/unittest.sh	(.../unittest.sh)	(revision 7d9c33defa7ed7ddffb61c0ce8c0f8f5c5a03845)
@@ -41,14 +41,19 @@
 
 
     # --- setup local or server Environment
-    export DISPLAY_NO=97
+    DISPLAY_NO=:10.0
     QT_VER=""
 
     DENALI_SQUISH=denaliSquish
 
     if [ ! -z "$RUN_FOR_LOCAL" ];then #is local
+        DISPLAY_NO=:0
         QT_VER="5.12.5"
         SERVER_DIR="/media/sf_VMSHARE"
+        #Setting up Display number
+        if [ ! -z "$1" ]; then
+            DISPLAY_NO=$1
+        fi
 
         #setup Qt dir version
         if [ ! -z "$2" ]; then
@@ -72,15 +77,13 @@
     PROJECT_CHECKOUT_INDEX=8
 	COMMON_CHECKOUT_INDEX=9
 
-    if [ -z "$RUN_FOR_LOCAL" ];then #running on the build server
-        setBuildVariables ${buildSpecs[@]}
-        REPORT_DIR=$(getRemoteCopyAddress "DEN_UI" ${buildSpecs[$PROJECT_CHECKOUT_INDEX]})
-        STATUS_REPORT=$(createStatusReport "application" $REPORT_DIR)
-        # Call this function to check if the repository has to be tagged or not
-        tagUIRepository 
-        getCommitHashes $STATUS_REPORT ${buildSpecs[$PROJECT_NAME_INDEX]} ${buildSpecs[$PROJECT_CHECKOUT_INDEX]} \
-                        ${buildSpecs[$COMMON_CHECKOUT_INDEX]} 
-    fi
+    setBuildVariables ${buildSpecs[@]}
+	REPORT_DIR=$(getRemoteCopyAddress "DEN_UI" ${buildSpecs[$PROJECT_CHECKOUT_INDEX]})
+	STATUS_REPORT=$(createStatusReport "application" $REPORT_DIR)
+	# Call this function to check if the repository has to be tagged or not
+	tagUIRepository 
+	getCommitHashes $STATUS_REPORT ${buildSpecs[$PROJECT_NAME_INDEX]} ${buildSpecs[$PROJECT_CHECKOUT_INDEX]} \
+					${buildSpecs[$COMMON_CHECKOUT_INDEX]} 
     BUID_DIR=build
     BUILD_PATH=$WORKING_DIR/$BUID_DIR
 
@@ -97,6 +100,7 @@
     export PATH=$COCO_DIR/wrapper/bin/:$COCO_DIR/bin/:$PATH
     export LD_LIBRARY_PATH=$QT_DIR/lib
     export DISPLAY=$DISPLAY_NO
+    export DISPLAY_SQUISHQT=97
     if [ ! -z "$PYCOMMON" ]; then
         export PYTHONPATH=$WORKING_DIR/common/pycommon/squishapi/:$PYTHONPATH
     fi
@@ -205,23 +209,23 @@
 function start_SquishServer() {
     echo " ------------------------------ Starting the Squish Server"
     stop_xvfb
-    start_xvfb $DISPLAY
+    start_xvfb $DISPLAY_SQUISHQT
 
     $SQUISH_DIR/bin/squishserver            \
         --config addAUT $DENALI_SQUISH      \
         $WORKING_DIR/$BUID_DIR/             \
         2>    $LOG_PATH/squishqtserver.err  \
         | tee $LOG_PATH/squishqtserver.log
 
-    DISPLAY=:$DISPLAY $SQUISH_DIR/bin/squishserver            \
+    DISPLAY=:$DISPLAY_SQUISHQT $SQUISH_DIR/bin/squishserver            \
         1>> $LOG_PATH/squishqtserver.log    \
         2>> $LOG_PATH/squishqtserver.err    & # has to be &
 }
 
 function stop_SquishServer() {
     echo " ------------------------------ Stoping the Squish Server"
     $SQUISH_DIR/bin/squishserver --stop
-    stop_xvfb $DISPLAY
+    stop_xvfb $DISPLAY_SQUISHQT
 }
 
 function start_SquishRunner() {
@@ -410,7 +414,6 @@
 
     setup_Script_Environment
     setup_System_Environment # has to be after setup_Script_Environment ran
-
     clone_Repositories
     make_Directories