tools(coverage): make default report project-wide and strict

Author: arancormonk

tools/coverage.sh

@@ -1,35 +1,59 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
-# Simple coverage runner for protocol code paths.
-# Defaults to P25 + DMR. Requires lcov/genhtml or llvm-cov depending on compiler.
+# Coverage runner for repository sources.
+# Defaults to a clean project-wide src/ report. For the old protocol-only slice,
+# run with COVERAGE_SCOPE=protocol and optionally set PROTO_COVERAGE="p25 dmr nxdn".
 
 ROOT_DIR=$(cd "$(dirname "$0")/.." && pwd)
 BUILD_DIR="$ROOT_DIR/build/coverage-debug"
+BUILD_PRESET=${BUILD_PRESET:-coverage-debug-clean}
+TEST_PRESET=${TEST_PRESET:-coverage-debug}
+COVERAGE_SCOPE=${COVERAGE_SCOPE:-src}
 
 cmake --preset coverage-debug >/dev/null
-cmake --build --preset coverage-debug -j >/dev/null
-ctest --preset coverage-debug -V || true
-
-if command -v lcov >/dev/null 2>&1; then
-  echo "Generating lcov report..."
-  pushd "$BUILD_DIR" >/dev/null
-  lcov --capture --directory . --output-file coverage.info >/dev/null 2>&1 || true
-  # Filter to protocol sources (default: P25 + DMR). Override with PROTO_COVERAGE="p25 dmr nxdn" etc.
-  PROTO_COVERAGE=${PROTO_COVERAGE:-"p25 dmr"}
-  EXTRACT_ARGS=()
-  for proto in $PROTO_COVERAGE; do
-    EXTRACT_ARGS+=("${ROOT_DIR}/src/protocol/${proto}/*")
-  done
-  # Always include shared DMR/P25 FEC helpers if present
-  EXTRACT_ARGS+=("${ROOT_DIR}/src/fec/*")
-  lcov --extract coverage.info "${EXTRACT_ARGS[@]}" -o coverage.filtered.info >/dev/null 2>&1 || true
-  genhtml coverage.filtered.info --output-directory coverage_html >/dev/null 2>&1 || true
-  popd >/dev/null
-  echo "Coverage HTML: $BUILD_DIR/coverage_html/index.html"
-else
-  echo "lcov not found. For clang/llvm, run llvm-cov manually, e.g.:"
-  echo "  PROTO_COVERAGE=\"p25 dmr\" cmake --preset coverage-debug && cmake --build --preset coverage-debug && ctest --preset coverage-debug -V"
-  echo "  llvm-profdata merge -sparse *.profraw -o default.profdata"
-  echo "  llvm-cov show ./tests/dsd-neo_test_dmr_crc_props -format=html -instr-profile=default.profdata > coverage.html"
+cmake --build --preset "$BUILD_PRESET" -j >/dev/null
+ctest --preset "$TEST_PRESET" --output-on-failure
+
+if ! command -v lcov >/dev/null 2>&1 || ! command -v genhtml >/dev/null 2>&1; then
+  echo "lcov/genhtml are required for tools/coverage.sh." >&2
+  echo "Install lcov, or run an explicit llvm-cov flow manually." >&2
+  exit 1
 fi
+
+echo "Generating lcov report..."
+pushd "$BUILD_DIR" >/dev/null
+lcov --capture --directory . --output-file coverage.info >/dev/null
+
+case "$COVERAGE_SCOPE" in
+  src|project)
+    REPORT_NAME="coverage.src.info"
+    REPORT_DIR="coverage_html"
+    REPORT_LABEL="project src/"
+    lcov --extract coverage.info "${ROOT_DIR}/src/*" -o "$REPORT_NAME" >/dev/null
+    ;;
+  protocol)
+    REPORT_NAME="coverage.protocol.info"
+    REPORT_DIR="coverage_protocol_html"
+    PROTO_COVERAGE=${PROTO_COVERAGE:-"p25 dmr"}
+    REPORT_LABEL="protocol slice (${PROTO_COVERAGE}) + fec"
+    EXTRACT_ARGS=()
+    for proto in $PROTO_COVERAGE; do
+      EXTRACT_ARGS+=("${ROOT_DIR}/src/protocol/${proto}/*")
+    done
+    EXTRACT_ARGS+=("${ROOT_DIR}/src/fec/*")
+    lcov --extract coverage.info "${EXTRACT_ARGS[@]}" -o "$REPORT_NAME" >/dev/null
+    ;;
+  *)
+    echo "Unknown COVERAGE_SCOPE: $COVERAGE_SCOPE" >&2
+    echo "Expected one of: src, project, protocol" >&2
+    exit 1
+    ;;
+esac
+
+genhtml "$REPORT_NAME" --output-directory "$REPORT_DIR" >/dev/null
+printf 'Coverage summary (%s)\n' "$REPORT_LABEL"
+lcov --summary "$REPORT_NAME"
+popd >/dev/null
+
+echo "Coverage HTML: $BUILD_DIR/$REPORT_DIR/index.html"