Portability: fixes for gcc/4.8

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

Author: henry2cox

bin/geninfo

@@ -1123,7 +1123,7 @@ sub _process_one_chunk($$$$)
                           "geninfo_XXXXX",
                           DIR     => $tempFileDir,
                           CLEANUP => !defined($lcovutil::preserve_intermediates)
-        ) if ($intermediate || !defined($gcda_file));
+        ) if ($intermediate || defined($gcda_file));
 
         # keep track of order - so we can estimate which files were processed
         # at same time

lib/lcovutil.pm

@@ -6298,9 +6298,20 @@ sub applyFilters
                                        $func->name() . "\n");
                     $func->set_end_line($currentLine);
                 }
-                die('failed to set end line for ' .
-                    $func->name() . ' in file ' . $func->filename())
-                    unless defined($func->end_line());
+                # we may not have set the end line above due to inconsistency
+                #  but we also might not have line data
+                #  - see .../tests/lcov/extract with gcc/4.8
+                if (!defined($func->end_line())) {
+                    lcovutil::ignorable_error(
+                     $lcovutil::ERROR_INCONSISTENT_DATA,
+                     '"' . $func->filename() . '":' . $func->line() .
+                         ': failed to set end line for function ' .
+                         $func->name() .
+                         ".  See lcovrc man entry for 'derive_function_end_line'."
+                    );
+                    next FUNC;
+                }
+
                 # now look for this function in each testcase -
                 #  set the same endline (if not already set)
                 my $key = $func->file() . ':' . $first;

tests/gendiffcov/simple/script.sh

@@ -899,8 +899,8 @@ fi
 
 
 # check select script
-echo ${LCOV_HOME}/bin/genhtml $DIFFCOV_OPTS --baseline-file ./baseline.info.gz --diff-file diff.txt --annotate-script `pwd`/annotate.sh --show-owners all --ignore-errors source --select "$SELECT" --select --owner --select stanley.ukeridge current.info -o select
-$COVER ${GENHTML_TOOL} $DIFFCOV_OPTS --baseline-file ./baseline.info.gz --diff-file diff.txt --annotate-script `pwd`/annotate.sh --show-owners all --ignore-errors source --select "$SELECT" --select --owner --select stanley.ukeridge current.info -o select
+echo ${LCOV_HOME}/bin/genhtml $DIFFCOV_OPTS --baseline-file ./baseline.info.gz --diff-file diff.txt --annotate-script `pwd`/annotate.sh --show-owners all --ignore-errors source --select "$SELECT" --select --owner --select stanley.ukeridge current.info -o select $IGNORE
+$COVER ${GENHTML_TOOL} $DIFFCOV_OPTS --baseline-file ./baseline.info.gz --diff-file diff.txt --annotate-script `pwd`/annotate.sh --show-owners all --ignore-errors source --select "$SELECT" --select --owner --select stanley.ukeridge current.info -o select $IGNORE
 if [ 0 != $? ] ; then
     echo "ERROR: genhtml select did not pass"
     status=1
@@ -937,8 +937,8 @@ fi
 
 
 # check select script
-echo ${LCOV_HOME}/bin/genhtml $DIFFCOV_OPTS --baseline-file ./baseline.info.gz --diff-file diff.txt --annotate-script `pwd`/annotate.sh --show-owners all --ignore-errors source --select "$SELECT" --select --owner --select not.there current.info -o select2
-$COVER ${GENHTML_TOOL} $DIFFCOV_OPTS --baseline-file ./baseline.info.gz --diff-file diff.txt --annotate-script `pwd`/annotate.sh --show-owners all --ignore-errors source --select "$SELECT" --select --owner --select not.there current.info -o select2
+echo ${LCOV_HOME}/bin/genhtml $DIFFCOV_OPTS --baseline-file ./baseline.info.gz --diff-file diff.txt --annotate-script `pwd`/annotate.sh --show-owners all --ignore-errors source --select "$SELECT" --select --owner --select not.there current.info -o select2 $IGNORE
+$COVER ${GENHTML_TOOL} $DIFFCOV_OPTS --baseline-file ./baseline.info.gz --diff-file diff.txt --annotate-script `pwd`/annotate.sh --show-owners all --ignore-errors source --select "$SELECT" --select --owner --select not.there current.info -o select2 $IGNORE
 if [ 0 != $? ] ; then
     echo "ERROR: genhtml select did not pass"
     status=1

tests/gendiffcov/synthesize/synthesize.sh

@@ -217,7 +217,7 @@ if [ 0 != ${PIPESTATUS[0]} ] ; then
 fi
 COUNT1=`grep -c -i "warning: .*range.* unknown line .* there are only" range.log`
 if [ 1 != $COUNT1 ] ; then
-    echo "Missing expected warning"
+    echo "Missing expected warning: expected 1 found $COUNT1"
     if [ 0 == $KEEP_GOING ] ; then
         exit 1
     fi

tests/genhtml/lambda/lambda.sh

@@ -96,6 +96,10 @@ if [ "${VER[0]}" -lt 5 ] ; then
     IGNORE="--ignore inconsistent"
     # and filter exception branches to avoid spurious differences for old compiler
     FILTER='--filter branch'
+
+    # gcc older than 5 doesn't support lambda
+    echo "Compiler version it too old - skipping lambda test"
+    exit 0
 fi
 
 rm -rf *.txt* *.json dumper* report lambda *.gcda *.gcno *.info

tests/lcov/gcov-tool/run.sh

@@ -5,6 +5,8 @@
 
 set -ex
 
+rm -f test *.gcno *.gcda
+
 echo "Build test program"
 "$CC" test.c -o test --coverage