Update cryptest-coverage.sh script

GNUmakefile

@@ -1313,7 +1313,7 @@ android-clean:
 .PHONY: distclean
 distclean: clean autotools-clean cmake-clean android-clean
 	-$(RM) adhoc.cpp adhoc.cpp.copied GNUmakefile.deps benchmarks.html cryptest.txt
-	-$(RM) cryptest_debug.info cryptest_noasm.info cryptest_release.info cryptest.info
+	-$(RM) cryptest_all.info cryptest_debug.info cryptest_noasm.info cryptest_base.info cryptest.info cryptest_release.info
 	@-$(RM) cryptest-*.txt cryptopp.tgz libcryptopp.pc *.o *.bc *.ii *~
 	@-$(RM) -r cryptlib.lib cryptest.exe *.suo *.sdf *.pdb Win32/ x64/ ipch/
 	@-$(RM) -r $(LIBOBJS:.o=.obj) $(TESTOBJS:.o=.obj)

GNUmakefile-cross

@@ -763,7 +763,7 @@ android-clean:
 .PHONY: distclean
 distclean: clean autotools-clean cmake-clean android-clean
 	-$(RM) adhoc.cpp adhoc.cpp.copied GNUmakefile.deps benchmarks.html cryptest.txt
-	-$(RM) cryptest_debug.info cryptest_noasm.info cryptest_release.info cryptest.info
+	-$(RM) cryptest_all.info cryptest_debug.info cryptest_noasm.info cryptest_base.info cryptest.info cryptest_release.info
 	@-$(RM) cryptest-*.txt cryptopp.tgz libcryptopp.pc *.o *.bc *.ii *~
 	@-$(RM) -r cryptlib.lib cryptest.exe *.suo *.sdf *.pdb Win32/ x64/ ipch/
 	@-$(RM) -r $(LIBOBJS:.o=.obj) $(TESTOBJS:.o=.obj)

TestScripts/cryptest-coverage.sh

@@ -1,13 +1,13 @@
 #!/usr/bin/env bash
 
 if ! command -v gcov > /dev/null; then
-	echo "Please install gcov"
+    echo "Please install gcov"
-	exit 1
+    exit 1
 fi
 
 if ! command -v lcov > /dev/null; then
-	echo "Please install lcov"
+    echo "Please install lcov"
-	exit 1
+    exit 1
 fi
 
 # Default make jobs
@@ -16,11 +16,11 @@ MAKE_JOBS=${MAKE_JOBS:-4}
 # Default temp directory
 if [ -z "${TMPDIR}" ];
 then
-	if [ -d "${HOME}/tmp" ]; then
+    if [ -d "${HOME}/tmp" ]; then
-		TMPDIR="${HOME}/tmp"
+        TMPDIR="${HOME}/tmp"
-	else
+    else
-		TMPDIR="/tmp"
+        TMPDIR="/tmp"
-	fi
+    fi
 fi
 
 DEBUG_CXXFLAGS="-DDEBUG -DCRYPTOPP_COVERAGE=1 -g3 -O1 -coverage"
@@ -31,7 +31,19 @@ RELEASE_CXXFLAGS="-DNDEBUG -DCRYPTOPP_COVERAGE=1 -g3 -O1 -coverage"
 rm -rf TestCoverage/ >/dev/null
 make distclean >/dev/null
 
-lcov --base-directory . --directory . --zerocounters -q
+echo "**************************************************"
+echo "*****             Baseline build             *****"
+echo "**************************************************"
+
+make clean > /dev/null
+if ! make -j "${MAKE_JOBS}";
+then
+    echo "Baseline build failed"
+    exit 1
+fi
+
+# Create a baseline
+lcov --base-directory . --directory . -i -c -o cryptest_base.info
 
 echo "**************************************************"
 echo "*****               Debug build              *****"
@@ -40,13 +52,15 @@ echo "**************************************************"
 make clean > /dev/null
 if ! CXXFLAGS="${DEBUG_CXXFLAGS}" make -j "${MAKE_JOBS}";
 then
-	echo "Debug build failed"
+    echo "Debug build failed"
-	exit 1
+    exit 1
 fi
 
+# Run test programs
 ./cryptest.exe v
 ./cryptest.exe tv all
 
+# Gather data
 lcov --base-directory . --directory . -c -o cryptest_debug.info
 
 echo "**************************************************"
@@ -56,13 +70,15 @@ echo "**************************************************"
 make clean > /dev/null
 if ! CXXFLAGS="${NOASM_CXXFLAGS}" make -j "${MAKE_JOBS}";
 then
-	echo "No ASM build failed"
+    echo "No ASM build failed"
-	exit 1
+    exit 1
 fi
 
+# Run test programs
 ./cryptest.exe v
 ./cryptest.exe tv all
 
+# Gather data
 lcov --base-directory . --directory . -c -o cryptest_noasm.info
 
 echo "**************************************************"
@@ -72,36 +88,43 @@ echo "**************************************************"
 make clean > /dev/null
 if ! CXXFLAGS="${RELEASE_CXXFLAGS}" make -j "${MAKE_JOBS}";
 then
-	echo "Release build failed"
+    echo "Release build failed"
-	exit 1
+    exit 1
 fi
 
+# Run test programs
 ./cryptest.exe v
 ./cryptest.exe tv all
 ./cryptest.exe b 0.5
 
+# Gather data
 lcov --base-directory . --directory . -c -o cryptest_release.info
 
 echo "**************************************************"
 echo "*****             HTML processing            *****"
 echo "**************************************************"
 
-if [ ! e cryptest_debug.info ]; then
+if [ ! -e cryptest_debug.info ]; then
-	echo "WARN: cryptest_debug.info does not exist"
+    echo "WARN: cryptest_debug.info does not exist"
 fi
-if [ ! e cryptest_noasm.info ]; then
+if [ ! -e cryptest_noasm.info ]; then
-	echo "WARN: cryptest_noasm.info does not exist"
+    echo "WARN: cryptest_noasm.info does not exist"
 fi
-if [ ! e cryptest_release.info ]; then
+if [ ! -e cryptest_release.info ]; then
-	echo "WARN: cryptest_release.info does not exist"
+    echo "WARN: cryptest_release.info does not exist"
 fi
 
-lcov --add-tracefile cryptest_debug.info --add-tracefile cryptest_noasm.info --add-tracefile cryptest_release.info -o cryptest.info
+# The man page at https://linux.die.net/man/1/lcov says to add cryptest_base.info,
+# but it causes an error in the command below.
+# --add-tracefile cryptest_base.info
+lcov --add-tracefile cryptest_debug.info \
+    --add-tracefile cryptest_noasm.info \
+    --add-tracefile cryptest_release.info \
+    --output-file cryptest_all.info
 
-lcov --remove cryptest.info "*/adhoc*.*" -o cryptest.info
+lcov --remove cryptest_all.info \
-lcov --remove cryptest.info "*/fipstest*.*" -o cryptest.info
+    '/usr/*' 'adhoc*.*' 'fipstest*.*' 'fips140*.*' \
-lcov --remove cryptest.info "*/fips140*.*" -o cryptest.info
+    --output-file cryptest.info
-lcov --remove cryptest.info "/usr/*" -o cryptest.info
 
 genhtml -o TestCoverage/ -t "Crypto++ test coverage" --num-spaces 4 cryptest.info