From aafc8ac71b6f0063cc0da22ee346a342af07ace6 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Fri, 14 May 2021 01:33:37 +0200
Subject: [PATCH] coverity tooling: use 2020.09 and fix tests

---
 .coverity.conf.sample                              |  9 ++++-----
 covbuild.sh                                        |  4 ++--
 covconfig.sh                                       |  1 -
 doc/md/Development/Coverity-Scan-Config-and-Run.md | 14 ++++++++++----
 4 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/.coverity.conf.sample b/.coverity.conf.sample
index 5caf5d6fb..d5fffdca1 100644
--- a/.coverity.conf.sample
+++ b/.coverity.conf.sample
@@ -1,13 +1,12 @@
 COVLOGIN=myemail@corp.com
 COVTOKEN=aAbBcCdDeEfFgGhHiIjJkK
 # Toolchain available at https://scan.coverity.com/download
-COVBINDIR="/opt/cov-analysis-linux64-2019.03/bin"
+COVBINDIR="/opt/cov-analysis-linux64-2020.09/bin"
 # Nickname included in scan description:
 NICKNAME=myself
-# cov can't read gcov from gcc > 7
-HOSTCC=gcc-7
-HOSTCXX=g++-7
-HOSTLD=g++-7
+HOSTCC=gcc-10
+HOSTCXX=g++-10
+HOSTLD=g++-10
 
 # Do not change it:
 COVDIR=cov-int
diff --git a/covbuild.sh b/covbuild.sh
index 73c9a4441..b96e7059f 100755
--- a/covbuild.sh
+++ b/covbuild.sh
@@ -17,8 +17,7 @@ cov-build --dir "$COVDIR" --c-coverage=gcov --no-network-coverage --no-generate-
 #########################################
 # Build ARM, no test coverage           #
 #########################################
-cov-build --dir "$COVDIR" --no-generate-build-id --force make bootrom
-cov-build --dir "$COVDIR" --no-generate-build-id --force make fullimage
+cov-build --dir "$COVDIR" --no-generate-build-id --force make recovery
 
 #########################################
 # Build client                          #
@@ -27,6 +26,7 @@ cov-build --dir "$COVDIR" --no-generate-build-id --force make fullimage
 # and we want the client-side of the common/ analysis
 cov-build --dir "$COVDIR" --c-coverage=gcov --no-network-coverage --no-generate-build-id --force make CC=$HOSTCC CXX=$HOSTCXX LD=$HOSTLD mfkey
 cov-build --dir "$COVDIR" --c-coverage=gcov --no-network-coverage --no-generate-build-id --force make CC=$HOSTCC CXX=$HOSTCXX LD=$HOSTLD nonce2key
+cov-build --dir "$COVDIR" --c-coverage=gcov --no-network-coverage --no-generate-build-id --force make CC=$HOSTCC CXX=$HOSTCXX LD=$HOSTLD mf_nonce_brute
 cov-build --dir "$COVDIR" --c-coverage=gcov --no-network-coverage --no-generate-build-id --force make CC=$HOSTCC CXX=$HOSTCXX LD=$HOSTLD client
 
 #########################################
diff --git a/covconfig.sh b/covconfig.sh
index b762ac6f1..3d13786cb 100755
--- a/covconfig.sh
+++ b/covconfig.sh
@@ -5,5 +5,4 @@ set -e
 
 # cov-configure --list-configured-compilers text
 cov-configure --template --compiler arm-none-eabi-gcc --comptype gcc
-# cov can't read gcov from gcc > 7
 cov-configure --template --compiler $HOSTCC --comptype gcc
diff --git a/doc/md/Development/Coverity-Scan-Config-and-Run.md b/doc/md/Development/Coverity-Scan-Config-and-Run.md
index da510c022..d6279a6bb 100644
--- a/doc/md/Development/Coverity-Scan-Config-and-Run.md
+++ b/doc/md/Development/Coverity-Scan-Config-and-Run.md
@@ -1,15 +1,21 @@
 
 ## Coverity Scan Config & Run
-Download the Coverity Scan Self-build and install it.
+Download the Coverity Scan Self-build from https://scan.coverity.com/download/ and untar it.
+
 You will need to configure  ARM-NON-EABI- Compiler for it to use:
 
- Configure
+Configure
 
 ```sh
-cov-configure --comptype gcc --compiler  /opt/devkitpro/devkitARM/bin/arm-none-eabi-gcc
+cov-configure --template --compiler arm-none-eabi-gcc --comptype gcc
+```
+If it's in a unusual location:
+
+```sh
+cov-configure --comptype gcc --compiler /opt/devkitpro/devkitARM/bin/arm-none-eabi-gcc
 ```
 
-Run it (I'm running on Ubuntu)
+Run it
 
 ```sh
 cov-build --dir cov-int make all