logsui/tsrc/unittestrunner/unittest_qt.pl
changeset 21 2f0af9ba7665
parent 0 4a5361db8937
--- a/logsui/tsrc/unittestrunner/unittest_qt.pl	Fri Sep 17 16:47:32 2010 +0300
+++ b/logsui/tsrc/unittestrunner/unittest_qt.pl	Fri Oct 15 14:47:48 2010 +0300
@@ -29,6 +29,7 @@
 $unitTestRunner = "unittest_qt.pl";
 $scriptLocation = "logsui/tsrc/unittestrunner";
 $coverageResultsDirDefault = "logsui/tsrc/unittestrunner/qtresults/";
+$coverageResultsDirFunctional = "logsui/tsrc/unittestrunner/qtfunctionalresults";
 $testConfigDefault = "unittest_qt_config.txt";
 $qtProFileDefault = "tsrc.pro";
 $buildResults = "BuildResults.txt";
@@ -48,6 +49,8 @@
 $outputString = "";
 $outputFileBodyStart = "<body";
 
+$qmakeConfig = "-config coverage";
+
 $totalCount = 0;
 $passedCount = 0;
 $failedCount = 0;
@@ -99,6 +102,9 @@
 chdir("$coverageResultsDir");
 doSystemCall("ctcpost $coverageSymbols $coverageDat -p $coverageProfile -T 70");
 doSystemCall("ctc2html -i $coverageProfile -t 70");
+$coverageResultsDirFunctional = "$projectdrive$projectrootname$coverageResultsDirFunctional";
+doSystemCall("ctcpost $coverageSymbols $coverageDat -ff -p $coverageProfile");
+doSystemCall("ctc2html -i $coverageProfile -o $coverageResultsDirFunctional");
 
 # clear target for intrumentation result
 $ENV{'CTC_DATA_PATH'}= "";	
@@ -220,9 +226,9 @@
         print("Pro file not defined, using default. \n");
         $qtProFile = $qtProFileDefault;
     }
-    doSystemCall( "qmake $qtProFile" );
+    doSystemCall( "qmake $qtProFile $qmakeConfig" );
     doSystemCall( "sbs reallyclean" );
-    doSystemCall( "qmake $qtProFile" );
+    doSystemCall( "qmake $qtProFile $qmakeConfig" );
     
     $exclude = "-C \"EXCLUDE+*\tsrc\*\" -C \"EXCLUDE+*/*/tsrc/*\" -C \"EXCLUDE+*/*/*/tsrc/*\" -C \"EXCLUDE+moc_*\"";