Index: build/unittest.sh =================================================================== diff -u -r389e71d8a8715b004a8380e598fc6786bafc303e -r768be176aa93c9af7e7429b956e6ca8c83bdf679 --- build/unittest.sh (.../unittest.sh) (revision 389e71d8a8715b004a8380e598fc6786bafc303e) +++ build/unittest.sh (.../unittest.sh) (revision 768be176aa93c9af7e7429b956e6ca8c83bdf679) @@ -1,7 +1,7 @@ #!/bin/bash # Local example $./run.unittest.sh :0 5.12.5 /media/sf_VMSHARE -echo " ------------------------------ Definisions " +echo " ------------------------------ Definitions " DISPLAY_NO=:10.0 QT_VER="" @@ -90,6 +90,12 @@ ./tst_utilities_$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_acknow CONFIG+=CodeCoverage TARGET=tst_acknow_$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_acknow_$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" @@ -106,22 +112,24 @@ echo " ------------------------------ Starting tests" $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+$?)) +cp $REPORT/$LOG/QtTest.log $REPORT/UnitTest/QtTest.txt echo " ------------------------------ Merging the excecution report databases" 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 \ $BUID_DIR/tst_utilities_$DENALI_QTTEST.csmes \ + $BUID_DIR/tst_acknow_$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/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 QtTest -e $BUID_DIR/tst_utilities_$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_acknow_$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"