Index: build/unittest.sh =================================================================== diff -u -rac81cfae5a04bcfe5f1c5c79520d776411dd0e91 -r56545d8ba36e37940d189a7b3097d24e1c7bd84e --- build/unittest.sh (.../unittest.sh) (revision ac81cfae5a04bcfe5f1c5c79520d776411dd0e91) +++ build/unittest.sh (.../unittest.sh) (revision 56545d8ba36e37940d189a7b3097d24e1c7bd84e) @@ -70,12 +70,20 @@ if [ -z "$RUN_QTTEST" ]; then 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=$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 +$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 -./$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_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_logging_$DENALI_QTTEST -o -,txt 1>>../$REPORT/$LOG/QtTest.log 2>>../$REPORT/$LOG/QtTest.err +UNITTEST_RESULT=$((UNITTEST_RESULT+$?)) + fi echo " ------------------------------ Squish : Configure The Project for Coverage" @@ -96,10 +104,16 @@ 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 +cmmerge -o $BUID_DIR/denali.csmes \ + $BUID_DIR/$DENALI_SQUISH.csmes \ + $BUID_DIR/tst_canbus_$DENALI_QTTEST.csmes \ + $BUID_DIR/tst_logging_$DENALI_QTTEST.csmes \ + 1>$REPORT/$LOG/cmmerge.log + 2>$REPORT/$LOG/cmmerge.err echo " ------------------------------ Importing the excecution report into the coverage database" -cmcsexeimport -m $BUID_DIR/denali.csmes -t QtTest -e $BUID_DIR/$DENALI_QTTEST.csexe 1>$REPORT/$LOG/cmcsexeimport_qttest.log 2>$REPORT/$LOG/cmcsexeimport_qttest.err +cmcsexeimport -m $BUID_DIR/denali.csmes -t QtTest -e $BUID_DIR/tst_canbus_$DENALI_QTTEST.csexe 1>$REPORT/$LOG/cmcsexeimport_qttest.log 2>$REPORT/$LOG/cmcsexeimport_qttest.err +cmcsexeimport -m $BUID_DIR/denali.csmes -t QtTest -e $BUID_DIR/tst_logging_$DENALI_QTTEST.csexe 1>$REPORT/$LOG/cmcsexeimport_qttest.log 2>$REPORT/$LOG/cmcsexeimport_qttest.err cmcsexeimport -m $BUID_DIR/denali.csmes -t Squish -e $BUID_DIR/$DENALI_SQUISH.csexe 1>$REPORT/$LOG/cmcsexeimport_squish.log 2>$REPORT/$LOG/cmcsexeimport_squish.err echo " ------------------------------ Generating the coverage report"