code coverage: reset getopts for merge.sh
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 @@
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 @@
echo "$help_message"
}
-
[ ${-/x} != ${-} ] && TRACING=true || TRACING=false
LOCAL_WORKSPACE=""
CLONE_SOURCES=false
@@ -400,6 +401,7 @@
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 @@
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)"