Use environment variable to force parallel execution - to enable more thorough testing.

Signed-off-by: Henry Cox <[email protected]>

Author: henry2cox

Makefile

@@ -238,19 +238,27 @@ ifeq ($(COVERAGE), 1)
 # write to .../tests/cover_db
 export COVER_DB := $(shell echo `pwd`/tests/cover_db)
 export PYCOV_DB := $(shell echo `pwd`/tests/pycov.dat)
-export HTML_RPT := ./lcov_coverage
+export HTML_RPT := $(shell echo `pwd`/lcov_coverage)
+#export LCOV_FORCE_PARALLEL = 1
 endif
 export TESTCASE_ARGS
 
 test: check
 
+# for COVERAGE mode check: run once with LCOV_FORCE_PARALLEL=1 and
+#   once without - so we can merge the result
 check:
-	if [ "x$(COVERAGE)" != 'x' ] && [ ! -d $(COVER_DB) ]; then \
-	  mkdir $(COVER_DB) ; \
-	fi
+	if [ "x$(COVERAGE)" != 'x' ] ; then                                 \
+	  if [ ! -d $(COVER_DB) ]; then                                     \
+	    mkdir $(COVER_DB) ;                                             \
+	  fi ;                                                              \
+	  echo "*** Run once, force parallel ***" ;                         \
+	  LCOV_FORCE_PARALLEL=1 $(MAKE) -s -C tests check LCOV_HOME=`pwd` ; \
+	  echo "*** Run again, no force ***" ;                              \
+	fi 
 	@$(MAKE) -s -C tests check LCOV_HOME=`pwd`
-	@if [ "x$(COVERAGE)" != 'x' ] ; then \
-	  $(MAKE) -s -C tests report ; \
+	@if [ "x$(COVERAGE)" != 'x' ] ; then       \
+	  $(MAKE) -s -C tests report ;             \
 	fi
 
 # Files to be checked for coding style issue issues -

lib/lcovutil.pm

@@ -6025,8 +6025,7 @@ sub _processFilterWorklist
     my $parallel = $lcovutil::lcov_filter_parallel;
     # not much point in parallel calculation if the number of files is small
     my $workList = $fileList;
-    PARALLEL:
-    if (scalar(@$fileList) > 50 &&
+    if ((exists($ENV{LCOV_FORCE_PARALLEL}) || scalar(@$fileList) > 50) &&
         $parallel &&
         1 < $lcovutil::maxParallelism) {
 
@@ -6057,23 +6056,24 @@ sub _processFilterWorklist
                 $chunkSize = 1;
             }
         }
-        last PARALLEL if $chunkSize == 1;
-        $workList = [];
-        my $idx     = 0;
-        my $current = [];
-        # maybe sort files by number of lines, then distribute larger ones
-        #   across chunks?  Or sort so total number of lines is balanced
-        foreach my $f (@$fileList) {
-            push(@$current, $f);
-            if (++$idx == $chunkSize) {
-                $idx = 0;
-                push(@$workList, $current);
-                $current = [];
+        if ($chunkSize != 1) {
+            $workList = [];
+            my $idx     = 0;
+            my $current = [];
+            # maybe sort files by number of lines, then distribute larger ones
+            #   across chunks?  Or sort so total number of lines is balanced
+            foreach my $f (@$fileList) {
+                push(@$current, $f);
+                if (++$idx == $chunkSize) {
+                    $idx = 0;
+                    push(@$workList, $current);
+                    $current = [];
+                }
             }
+            push(@$workList, $current) if (@$current);
+            lcovutil::info("Filter: chunkSize $chunkSize nChunks " .
+                           scalar(@$workList) . "\n");
         }
-        push(@$workList, $current) if (@$current);
-        lcovutil::info("Filter: chunkSize $chunkSize nChunks " .
-                       scalar(@$workList) . "\n");
     }
 
     my $srcReader = ReadCurrentSource->new();
@@ -7233,7 +7233,9 @@ sub merge
     }
 
     if (1 != $lcovutil::maxParallelism &&
-        1 < $nTests) {
+        (exists($ENV{LCOV_FORCE_PARALLEL}) ||
+            1 < $nTests)
+    ) {
         # parallel implementation is to segment the file list into N
         #  segments, then parse-and-merge scalar(@merge)/N files in each slave,
         #  then merge the slave result.

tests/Makefile

@@ -1,8 +1,8 @@
 ifeq ($(COVERAGE), 1)
 ifeq ($(COVER_DB),)
-export COVER_DB := $(shell `pwd`/cover_db)
-export PYCOV_DB := $(shell `pwd`/pycov.dat)
-export HTML_RPT := $(shell `pwd`/lcov_coverage)
+export COVER_DB := $(shell echo `pwd`/cover_db)
+export PYCOV_DB := $(shell echo `pwd`/pycov.dat)
+export HTML_RPT := $(shell echo `pwd`/lcov_coverage)
 endif
 endif
 

tests/gendiffcov/insensitive/insensitive.sh

@@ -35,7 +35,7 @@ while [ $# -gt 0 ] ; do
                LOCAL_COVERAGE=0
                shift
             fi
-            COVER="perl -MDevel::Cover=-db,${COVER_DB},-coverage,statement,branch,condition,subroutine "
+            COVER="perl -MDevel::Cover=-db,${COVER_DB},-coverage,statement,branch,condition,subroutine,-silent,1 "
             ;;
 
         --home | -home )

tests/gendiffcov/simple/script.sh

@@ -129,10 +129,11 @@ DIFFCOV_OPTS="--function-coverage --branch-coverage --highlight --demangle-cpp -
 #DIFFCOV_OPTS='--function-coverage --branch-coverage --highlight --demangle-cpp'
 
 rm -f test.cpp *.gcno *.gcda a.out *.info *.info.gz diff.txt diff_r.txt diff_broken.txt *.log *.err *.json dumper* results.xlsx annotate.{cpp,exe} c d ./cover_db_py
-rm -rf ./cover_db ./baseline ./current ./differential* ./reverse ./diff_no_baseline ./no_baseline ./no_annotation ./no_owners differential_nobranch reverse_nobranch baseline-filter* noncode_differential* broken mismatchPath elidePath ./cover_db ./criteria ./mismatched ./navigation differential_prop proportion ./annotate ./current-* ./current_prefix* select select2 html_report
+rm -rf ./baseline ./current ./differential* ./reverse ./diff_no_baseline ./no_baseline ./no_annotation ./no_owners differential_nobranch reverse_nobranch baseline-filter* noncode_differential* broken mismatchPath elidePath ./cover_db ./criteria ./mismatched ./navigation differential_prop proportion ./annotate ./current-* ./current_prefix* select select2 html_report
 
 if [ "x$COVER" != 'x' ] && [ 0 != $LOCAL_COVERAGE ] ; then
-    cover -delete
+    cover -delete -db $COVER_DB
+    rm -rf $PYCOV_DB
 fi
 
 if [[ 1 == $CLEAN_ONLY ]] ; then
@@ -1254,7 +1255,7 @@ fi
 
 if [ "x$COVER" != "x" ] && [ 0 != $LOCAL_COVERAGE ] ; then
     cover
-    ${LCOV_HOME}/bin/perl2lcov -o perlcov.info --testname simple --version-script $GET_VERSION ./cover_db
+    ${LCOV_HOME}/bin/perl2lcov -o perlcov.info --testname simple --version-script $GET_VERSION $COVER_DB
     ${LCOV_HOME}/bin/py2lcov -o pycov.info --testname simple --version-script $GET_VERSION $PYCOV_DB
     ${LCOV_HOME}/bin/genhtml -o html_report perlcov.info pycov.info --branch --flat --show-navigation --show-proportion --version-script $GET_VERSION --annotate-script $P4ANNOTATE --parallel --ignore empty,usage
     echo "see HTML report 'html_report'"