mark-tested: don't fail if coverage is too low

As the whole point of mark-tested is to help improve coverage, it is
silly to rail if coverage is too low.
So make it possible to easily skip that test in the Makefile.

Signed-off-by: NeilBrown <neil@brown.name>

diff --git a/csrc/oceani-tests.mdc b/csrc/oceani-tests.mdc
index dccfb2a47bc2bdb50f7f3a39e7c3adf09ccf1b01..5d1119785ea11760170e6fb180d6b32d4df5eb63 100644 (file)
--- a/csrc/oceani-tests.mdc
+++ b/csrc/oceani-tests.mdc
@@ -78,9 +78,9 @@ arguments separated from the name by commas.  For each test, there is a section
                @for i in coverage/#*.gcda; do mv $$i coverage/$${i##*#}; done
                @gcov -o coverage oceani.mdc > /dev/null 2> /dev/null
                @mv *.gcov coverage ; [ -f .gcov ] && mv .gcov coverage || true
-               @ awk '/NOTEST/ { next } /^ *[1-9]/ {ran+=1} /^ *###/ {skip+=1} \
+               @[ -n "$$SKIP_COVERAGE_CHECK" ] || awk '/NOTEST/ { next } /^ *[1-9]/ {ran+=1} /^ *###/ {skip+=1} \
                    END {printf "coverage: %6.2f%%\n", ran * 100 / (ran + skip); \
-                        if (ran < (ran + skip) *0.959) exit(1) }' \
+                        if (ran < (ran + skip) *0.96) exit(1) }' \
                        coverage/oceani.mdc.gcov
                @rm -f .tmp*
 

diff --git a/tools/mark-untested b/tools/mark-untested
index 1dd8db2cb889030d2ee45c9baef17df2f1f9871c..96aeb2c4ff41aa032b1b6b53876321c372902130 100755 (executable)
--- a/tools/mark-untested
+++ b/tools/mark-untested
@@ -9,7 +9,7 @@ case $1 in
 
   * )
        rm coverage/*.mdc.gcov
-       make SKIP_VALGRIND=1 oceani_test_suite || exit 1
+       make SKIP_VALGRIND=1 SKIP_COVERAGE_CHECK=1 oceani_test_suite || exit 1
        for i in coverage/*.mdc.gcov
        do
         b=${i%.gcov}