Index: build/unittest.sh
===================================================================
diff -u -r768be176aa93c9af7e7429b956e6ca8c83bdf679 -rfc2e596a6af398a6fba75e8a9c1c261b47ecb9a6
--- build/unittest.sh	(.../unittest.sh)	(revision 768be176aa93c9af7e7429b956e6ca8c83bdf679)
+++ build/unittest.sh	(.../unittest.sh)	(revision fc2e596a6af398a6fba75e8a9c1c261b47ecb9a6)
@@ -16,17 +16,17 @@
     SERVER_DIR="/media/sf_VMSHARE"
     #Setting up Display number
     if [ ! -z "$1" ]; then
-	    DISPLAY_NO=$1
+        DISPLAY_NO=$1
     fi
 
     #setup Qt dir version
     if [ ! -z "$2" ]; then
-	    QT_VER=$2
+        QT_VER=$2
     fi
 
     #Setting up server folder
     if [ ! -z "$1" ]; then
-	    SERVER_DIR=$3
+        SERVER_DIR=$3
     fi
 fi
 
@@ -52,7 +52,7 @@
 
 echo " ------------------------------ Clone Denali "
 if [ -z "$RUN_FOR_LOCAL" ]; then
-    git clone ssh://git@dvm-linux02:7999/ui/application.git 
+    git clone ssh://git@dvm-linux02:7999/ui/application.git
 else
     cp -r ../../Project/application application
 fi
@@ -72,16 +72,17 @@
 echo " ------------------------------ QtTest : Configure The Project for Coverage"
 
 # Coco Build - Instrumentation
-$QT_DIR/bin/qmake ../application/denali.pro -spec linux-g++ CONFIG+=qtquickcompiler CONFIG+=tst_canbus CONFIG+=CodeCoverage TARGET=tst_canbus_$DENALI_QTTEST
+# logging test should be the first one otherwise other tests will add logs to the log file content and test will fail.
+$QT_DIR/bin/qmake ../application/denali.pro -spec linux-g++ CONFIG+=qtquickcompiler CONFIG+=tst_logging CONFIG+=CodeCoverage TARGET=tst_logging_$DENALI_QTTEST
 /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
-./tst_canbus_$DENALI_QTTEST -o -,txt 1>>../$REPORT/$LOG/QtTest.log 2>>../$REPORT/$LOG/QtTest.err
+./tst_logging_$DENALI_QTTEST -o -,txt 1>>../$REPORT/$LOG/QtTest.log 2>>../$REPORT/$LOG/QtTest.err
 UNITTEST_RESULT=$((UNITTEST_RESULT+$?))
 
-$QT_DIR/bin/qmake ../application/denali.pro -spec linux-g++ CONFIG+=qtquickcompiler CONFIG+=tst_logging CONFIG+=CodeCoverage TARGET=tst_logging_$DENALI_QTTEST
+$QT_DIR/bin/qmake ../application/denali.pro -spec linux-g++ CONFIG+=qtquickcompiler CONFIG+=tst_canbus CONFIG+=CodeCoverage TARGET=tst_canbus_$DENALI_QTTEST
 /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
-./tst_logging_$DENALI_QTTEST -o -,txt 1>>../$REPORT/$LOG/QtTest.log 2>>../$REPORT/$LOG/QtTest.err
+./tst_canbus_$DENALI_QTTEST -o -,txt 1>>../$REPORT/$LOG/QtTest.log 2>>../$REPORT/$LOG/QtTest.err
 UNITTEST_RESULT=$((UNITTEST_RESULT+$?))
 
 $QT_DIR/bin/qmake ../application/denali.pro -spec linux-g++ CONFIG+=qtquickcompiler CONFIG+=tst_utilities CONFIG+=CodeCoverage TARGET=tst_utilities_$DENALI_QTTEST
@@ -122,7 +123,7 @@
     $BUID_DIR/tst_logging_$DENALI_QTTEST.csmes \
     $BUID_DIR/tst_utilities_$DENALI_QTTEST.csmes \
     $BUID_DIR/tst_acknow_$DENALI_QTTEST.csmes \
-    1>$REPORT/$LOG/cmmerge.log 
+    1>$REPORT/$LOG/cmmerge.log
     2>$REPORT/$LOG/cmmerge.err
 
 echo " ------------------------------ Importing the excecution report into the coverage database"