WebSVN – DevTools – Diff – /core_devl/trunk/CFG/TOOLSET/GCC.PL

 use warnings;
 # Global variables
 our $ScmPlatform;
 our $ScmNoToolsTest;
-our $ScmToolsetProcessTests;
 #   Misc variables
 my $UseGcov = 0;
 my $UseCppcheck = 0;
     $::ScmToolsetVersion = "1.0.0";             # our version
     $::ScmToolsetGenerate = 0;                  # GEN generate optional
     $::ScmToolsetCompilerPath = 1;              # Exports Compiler path to makefile via SCM_COMPILERPATH
     $::ScmToolsetProgDependancies = 0;          # handle Prog dependancies myself
     $::ScmToolsetSoName = 1;                    # Shared library supports SoName
-    $ScmToolsetProcessTests = 0;                # Unit Tests require Pre/Post processing - set later
 #.. Standard.rul requirements
+#
     $::s = "asm";
     $::o = "o";
     $file = StripExt( $obj );                   # Metric working file
     ToolsetGenerate( "\$(OBJDIR)/$file.met" );
     if ( $UseGcov )
+    {
-        $ScmToolsetProcessTests = 1;
         ToolsetGenerate( '$(OBJDIR)/' . $file . '.gcno' );
         ToolsetGenerate( '$(OBJDIR)/' . $file . '.gcda' );
+    }
+}
     $file = StripExt( $obj );                   # Metric working file
     ToolsetGenerate( "\$(OBJDIR)/$file.met" );
     if ( $UseGcov )
+    {
-        $ScmToolsetProcessTests = 1;
         ToolsetGenerate( '$(OBJDIR)/' . $file . '.gcno' );
         ToolsetGenerate( '$(OBJDIR)/' . $file . '.gcda' );
+    }
+}
     PackageProgAddFiles ( $name, $full );
     PackageProgAddFiles ( $name, $dbg );
+}
+  #-------------------------------------------------------------------------------
+# Function        : ToolsetPostprocess
+#
+# Description     : Last chance by the toolset to perform processing
+#                   All Directives have been processed
+#
+#                   If automated unit test are being used,
+#                   then we need to post process the results
+#
+# Inputs          : None
+#
+# Returns         :
+#
+sub ToolsetPostprocess
+{
+    ToolsetPreprocessTests();
+    ToolsetPostprocessTests();
+    ToolsetCollateTestResults();
+}
 ###############################################################################
 # Function        : ToolsetPreprocessTests
+#
 # Description     :
 sub ToolsetPreprocessTests
+{
     my ($io) = ToolsetPrinter::New();
     if ( $UseGcov && scalar(keys %::OBJSOURCE) > 0 )
+    {
-        #   Force The Pre/Post/Collate rules to be processed
-        $ScmToolsetProcessTests = 1;
+        my $ruleName = 'preprocess_gcov_data';
         my $finaldir='$(LOCALDIR)/lcov/$(GBE_PLATFORM)$(GBE_TYPE)';
         my $final=$finaldir . '/lcov-final.info';
         ToolsetGenerate( '$(OBJDIR)/lcov-baseline.info' );
+        ToolsetAddUnitTestPreProcess($ruleName);
-        $io->PrtLn('.PHONY: preprocess_tests' );
+        $io->PrtLn('.PHONY: ' . $ruleName );
-        $io->PrtLn('preprocess_tests:' );
+        $io->PrtLn($ruleName . ':' );
         my $key;
         my $value;
         while(($key, $value) = each(%::OBJSOURCE))
+        {
                       . ' --rc lcov_branch_coverage=1'
                       . ' --capture'
                       . ' --initial'
                       . ' --base-directory ' . $::Cwd
                       . ' --directory $(OBJDIR)'
                       . ' --output-file $(OBJDIR)/lcov-baseline.info' );
+        $io->Newline();
+    }
+}
 ###############################################################################
 sub ToolsetPostprocessTests
+{
     my ($io) = ToolsetPrinter::New();
     if ( $UseGcov && scalar(keys %::OBJSOURCE) > 0 )
+    {
+        my $ruleName = 'postprocess_gcov_data';
         my $finaldir='$(LOCALDIR)/lcov/$(GBE_PLATFORM)$(GBE_TYPE)';
         my $final=$finaldir . '/lcov-final.info';
         ToolsetGenerate( '$(OBJDIR)/lcov-capture.info' );
         ToolsetGenerate( $final );
+        ToolsetAddUnitTestPostProcess($ruleName);
-        $io->PrtLn('.PHONY: postprocess_tests' );
+        $io->PrtLn('.PHONY: ' . $ruleName );
-        $io->PrtLn('postprocess_tests:' );
+        $io->PrtLn($ruleName . ':' );
         $io->PrtLn("\t" . '$(eval GCDA_COUNT := $(shell find $(OBJDIR) -name "*.gcda"))');
         $io->PrtLn  ("\t" . '$(XX_PRE)$(mkdir) -p ' . $finaldir);
         $io->PrtPart("\t" . '$(XX_PRE)if [ "$(GCDA_COUNT)" = "" ]; then');
         $io->PrtPart("\t\t" . 'if [ ! -e ' . $final . " ]; then");
                           . ';');
         $io->PrtPart("\t\t\t" . '$(rm) -f ' . $final . ';');
         $io->PrtPart("\t\t\t" . '$(mv) $(OBJDIR)/lcov-merge.info ' . $final . ';');
         $io->PrtPart("\t\t" . 'fi' . ';');
         $io->PrtLn  ("\t" . 'fi');
+        $io->Newline();
+    }
+}
 ###############################################################################
 sub ToolsetCollateTestResults
+{
     my ($io) = ToolsetPrinter::New();
     if ( $UseGcov && scalar(keys %::OBJSOURCE) > 0 )
+    {
+        my $ruleName = 'collate_gcov_results';
         my $finaldir='$(LOCALDIR)/lcov/$(GBE_PLATFORM)$(GBE_TYPE)';
         my $final=$finaldir . '/lcov-final.info';
+        ToolsetAddUnitTestCollateProcess($ruleName);
         my $reportdir='$(PKGDIR)/lcov/$(GBE_PLATFORM)$(GBE_TYPE)';
         my $reportindex=$reportdir . '/index.html';
-        $io->PrtLn('.PHONY: collate_test_results' );
+        $io->PrtLn('.PHONY: ' . $ruleName );
-        $io->PrtLn('collate_test_results: ' . $reportindex);
+        $io->PrtLn($ruleName . ': ' . $reportindex);
         $io->Newline();
         $io->PrtLn($reportindex . ': ' . $final);
         $io->PrtLn("\t" . 'genhtml'
                       . ' --frames'
                       . ' --show-details'
                       . ' --branch-coverage'
                       . ' --output-directory ' . $reportdir
                       . ' --legend'
                       . ' --demangle-cpp'
                       . ' ' . $final);
+        $io->Newline();
+    }
+}
 ###############################################################################

Subversion Repositories DevTools

(root)/core_devl/trunk/CFG/TOOLSET/GCC.PL – Rev 4728 → 4778