From 7bae6209fbb0c1905cf4ee59ac81ed4efc6a7c29 Mon Sep 17 00:00:00 2001
From: Saul ROMERO DOMINGUEZ <saul.romerodominguez@arm.com>
Date: Wed, 23 Apr 2025 14:25:24 +0000
Subject: [PATCH] code coverage: reset getopts for merge.sh

---
 coverage-tool/coverage-reporting/merge.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/coverage-tool/coverage-reporting/merge.sh b/coverage-tool/coverage-reporting/merge.sh
index 899a784..1034b79 100755
--- a/coverage-tool/coverage-reporting/merge.sh
+++ b/coverage-tool/coverage-reporting/merge.sh
@@ -365,6 +365,8 @@ help_message=$(cat <<EOF
 EOF
 )
   clear || true
+  echo "Receiving arguments:"
+  echo $@
   echo "Usage:"
   echo "merge -h              Display this help message."
   echo "-j <JSON filename>    JSON configuration file (info and intermediate json filenames to be merged)."
@@ -379,7 +381,6 @@ EOF
   echo "$help_message"
 }
 
-
 [ ${-/x} != ${-} ] && TRACING=true || TRACING=false
 LOCAL_WORKSPACE=""
 CLONE_SOURCES=false
@@ -400,6 +401,7 @@ DEBUG_MODE=false
 genhtml_version=$(genhtml --version | rev | cut -d ' ' -f1 | rev | xargs)
 gen_major=$(echo "$genhtml_version" | cut -d '.' -f1)
 gen_minor=$(echo "$genhtml_version" | rev | cut -d '.' -f1 | rev)
+unset OPTIND
 while getopts ":hj:o:l:w:idcm:g" opt; do
   case ${opt} in
     h )
@@ -461,6 +463,7 @@ if [ -z "$LOCAL_WORKSPACE" ] && [ $CLONE_SOURCES = true ]; then
 fi
 # Getting the script folder where other qa-tools script files must reside, i.e
 # merge.py, clone_sources.py
+mkdir -p "${LCOV_FOLDER}"
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 LCOV_FOLDER="$(get_abs_path $LCOV_FOLDER)"
 merged_coverage_file="$(get_abs_path $merged_coverage_file)"
-- 
GitLab