Portability: tests should run successfully (if incompletely) with old gcc versions.

Fix spelling.

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

Author: henry2cox

tests/gendiffcov/errs/msgtest.sh

@@ -51,6 +51,19 @@ elif [ "${VER[0]}" -ge 14 ] ; then
     COVERAGE_OPTS="-fcondition-coverage"
 fi
 
+NO_INITIAL_CAPTURE=0
+if [[ "${VER[0]}" -gt 4 && "${VER[0]}" -lt 7 ]] ; then
+    # no data generated by initial capture
+    IGNORE_EMPTY="--ignore empty"
+    NO_INITIAL_CAPTURE=1
+fi
+
+if [ 1 == $NO_INITIAL_CAPTURE ] ; then
+    # all test test use --initial
+    echo 'all tests skipped'
+    exit 0
+fi
+
 echo `which gcov`
 echo `which lcov`
 

tests/lcov/exception/exception.sh

@@ -30,16 +30,18 @@ if [ 0 != $? ] ; then
     echo "Error:  unexpected error from gcc"
     exit 1
 fi
+NO_INITIAL_CAPTURE=0
 if [[ "${VER[0]}" -gt 4 && "${VER[0]}" -lt 7 ]] ; then
     # no data generated by initial capture
     IGNORE_EMPTY="--ignore empty"
+    NO_INITIAL_CAPTURE=1
 fi
 if [ "${VER[0]}" -lt 8 ] ; then
     # cannot generate branch data unless 'intermediate'
     IGNORE_USAGE="--ignore usage"
 fi
 $COVER $CAPTURE $LCOV_OPTS --initial -o initial.info $IGNORE_EMPTY $IGNORE_USAGE
-if [ 0 != $? ] ; then
+if [ $NO_INITIAL_CAPTURE != $? ] ; then
     echo "Error:  unexpected error code from lcov --initial"
     if [ $KEEP_GOING == 0 ] ; then
         exit 1

tests/lcov/extract/extract.sh

@@ -63,12 +63,13 @@ if [ "${VER[0]}" -lt 8 ] ; then
     DERIVE_END='--rc derive_function_end_line=0'
 fi
 
-
-$COVER $CAPTURE . $LCOV_OPTS --initial -o initial.info $IGNORE_EMPTY $IGNORE_USAGE
-if [ 0 != $? ] ; then
-    echo "Error:  unexpected error code from lcov --initial"
-    if [ $KEEP_GOING == 0 ] ; then
-        exit 1
+if [ 1 != $NO_INITIAL_CAPTURE ] ; then
+    $COVER $CAPTURE . $LCOV_OPTS --initial -o initial.info $IGNORE_EMPTY $IGNORE_USAGE
+    if [ 0 != $? ] ; then
+        echo "Error:  unexpected error code from lcov --initial"
+        if [ $KEEP_GOING == 0 ] ; then
+            exit 1
+        fi
     fi
 fi
 
@@ -77,16 +78,17 @@ if [ 0 != $? ] ; then
     echo "Error:  unexpected error from gcc"
     exit 1
 fi
-# capture 'all' - which will pick up the unused file
-$COVER $CAPTURE . $LCOV_OPTS --all -o all_initial.info $IGNORE_EMPTY $IGNORE_USAGE
-if [ 0 != $? ] ; then
-    echo "Error:  unexpected error code from lcov --capture --all"
-    if [ $KEEP_GOING == 0 ] ; then
-        exit 1
-    fi
-fi
 
 if [ "$NO_INITIAL_CAPTURE" != 1 ] ; then
+    # capture 'all' - which will pick up the unused file
+    $COVER $CAPTURE . $LCOV_OPTS --all -o all_initial.info $IGNORE_EMPTY $IGNORE_USAGE
+    if [ 0 != $? ] ; then
+        echo "Error:  unexpected error code from lcov --capture --all"
+        if [ $KEEP_GOING == 0 ] ; then
+            exit 1
+        fi
+    fi
+
     # does the result contain file 'uused'
     grep -E "SF:.+unused.c$" all_initial.info
     if [ $? != 0 ] ; then
@@ -891,27 +893,29 @@ mkdir -pv ./mytest
 echo "int main(){}" > './mytest/main space.cpp'
 ( cd ./mytest ; ${CXX} -c  'main space.cpp' --coverage )
 
-$COVER $CAPTURE mytest -i -o spaces.info
-if [ 0 != $? ] ; then
-    echo "Error:  unexpected error from filename containing space"
-    if [ $KEEP_GOING == 0 ] ; then
-        exit 1
+if [ 1 != $NO_INITIAL_CAPTURE ] ; then
+    $COVER $CAPTURE mytest -i -o spaces.info
+    if [ 0 != $? ] ; then
+        echo "Error:  unexpected error from filename containing space"
+        if [ $KEEP_GOING == 0 ] ; then
+            exit 1
+        fi
     fi
-fi
 
-$COVER $LCOV_TOOL --list spaces.info
-if [ 0 != $? ] ; then
-    echo "Error:  unable to list filename containing space"
-    if [ $KEEP_GOING == 0 ] ; then
-        exit 1
+    $COVER $LCOV_TOOL --list spaces.info
+    if [ 0 != $? ] ; then
+        echo "Error:  unable to list filename containing space"
+        if [ $KEEP_GOING == 0 ] ; then
+            exit 1
+        fi
     fi
-fi
 
-$COVER $GENHTML_TOOL -o spaces spaces.info
-if [ 0 != $? ] ; then
-    echo "Error:  unable to generate HTML for filename containing space"
-    if [ $KEEP_GOING == 0 ] ; then
-        exit 1
+    $COVER $GENHTML_TOOL -o spaces spaces.info
+    if [ 0 != $? ] ; then
+        echo "Error:  unable to generate HTML for filename containing space"
+        if [ $KEEP_GOING == 0 ] ; then
+            exit 1
+        fi
     fi
 fi
 

tests/lcov/follow/follow.sh

@@ -11,13 +11,24 @@ if [[ 1 == $CLEAN_ONLY ]] ; then
     exit 0
 fi
 
-
 LCOV_OPTS="$PARALLEL $PROFILE"
 # gcc/4.8.5 (and possibly other old versions) generate inconsistent line/function data
 IFS='.' read -r -a VER <<< `${CC} -dumpversion`
 if [ "${VER[0]}" -lt 5 ] ; then
     IGNORE="--ignore inconsistent"
 fi
+NO_INITIAL_CAPTURE=0
+if [[ "${VER[0]}" -gt 4 && "${VER[0]}" -lt 7 ]] ; then
+    # no data generated by initial capture
+    IGNORE_EMPTY="--ignore empty"
+    NO_INITIAL_CAPTURE=1
+fi
+
+if [ 1 == $NO_INITIAL_CAPTURE ] ; then
+    # all test test use --initial
+    echo 'all tests skipped'
+    exit 0
+fi
 
 
 mkdir -p rundir

tests/lcov/initializer/initializer.sh

@@ -26,6 +26,12 @@ if [ "${VER[0]}" -lt 5 ] ; then
     exit 0
 fi
 
+if [[ "${VER[0]}" -lt 8 ]] ; then
+    # c++17 not supported
+    echo "no c++ support"
+    exit 0
+fi
+
 if ! type ${CXX} >/dev/null 2>&1 ; then
         echo "Missing tool: ${CXX}" >&2
         exit 2

tests/lcov/multiple/multiple.sh

@@ -9,6 +9,12 @@ IFS='.' read -r -a VER <<< `${CC} -dumpversion`
 if [ "${VER[0]}" -lt 5 ] ; then
     IGNORE="--ignore inconsistent"
 fi
+NO_INITIAL_CAPTURE=0
+if [[ "${VER[0]}" -gt 4 && "${VER[0]}" -lt 7 ]] ; then
+    # no data generated by initial capture
+    IGNORE_EMPTY="--ignore empty"
+    NO_INITIAL_CAPTURE=1
+fi
 
 rm -rf rundir
 
@@ -30,6 +36,12 @@ echo 'int b (int x) { return x + 2;}' > b/b.c
 ( cd a ; ${CC} -c --coverage a.c -o a.o )
 ( cd b ; ${CC} -c --coverage b.c -o b.o )
 
+if [ 1 == $NO_INITIAL_CAPTURE ] ; then
+    # all test test use --initial
+    echo 'all tests skipped'
+    exit 0
+fi
+
 $COVER $LCOV_TOOL -o out.info --capture --initial --no-external -d a -d b
 if [ 0 != $? ] ; then
     echo "Error:  unexpected error code from lcov --initial"