Index: build/unittest.sh =================================================================== diff -u -r3c40c9798b5f45667bfa8115a22ae3ff584e6183 -r7680db04429ee15d00801b33c7b1004ca0c9ddb8 --- build/unittest.sh (.../unittest.sh) (revision 3c40c9798b5f45667bfa8115a22ae3ff584e6183) +++ build/unittest.sh (.../unittest.sh) (revision 7680db04429ee15d00801b33c7b1004ca0c9ddb8) @@ -71,15 +71,16 @@ echo " ------------------------------ QtTest : Configure The Project for Coverage" # Coco Build - Instrumentation $QT_DIR/bin/qmake ../application/denali.pro -spec linux-g++ CONFIG+=qtquickcompiler CONFIG+=testcase CONFIG+=CodeCoverage TARGET=$DENALI_QTTEST -/usr/bin/make LINK=csg++ AR=csar CXX=csg++ CC=csgcc -j4 +/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 1>$REPORT/$LOG/qttest.log 2>$REPORT/$LOG/qttest.err +./$DENALI_QTTEST -o -,txt 1>../$REPORT/UnitTest/QtTest.txt 2>../$REPORT/$LOG/QtTest.err +cp ../$REPORT/UnitTest/QtTest.txt ../$REPORT/$LOG/QtTest.log fi echo " ------------------------------ Squish : Configure The Project for Coverage" # Coco Build - Instrumentation $QT_DIR/bin/qmake ../application/denali.pro -spec linux-g++ CONFIG+=qtquickcompiler CONFIG+=CodeCoverage TARGET=$DENALI_SQUISH -/usr/bin/make LINK=csg++ AR=csar CXX=csg++ CC=csgcc -j4 +/usr/bin/make LINK=csg++ AR=csar CXX=csg++ CC=csgcc -j4 1>../$REPORT/$LOG/build_for_SquishQt.log 2>../$REPORT/$LOG/build_for_SquishQt.err /usr/bin/make clean cd .. @@ -93,7 +94,7 @@ UNITTEST_RESULT=$? echo " ------------------------------ Merging the excecution report databases" -cmmerge -o $BUID_DIR/denali.csmes $BUID_DIR/$DENALI_SQUISH.csmes $BUID_DIR/$DENALI_QTTEST.csmes +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 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