diff --git a/coverage-tool/coverage-reporting/merge.sh b/coverage-tool/coverage-reporting/merge.sh index 899a784548a6b02c4f9f0628ea96cf76641a2fa4..1034b79612848171497db629a59c6f0db435baca 100755 --- a/coverage-tool/coverage-reporting/merge.sh +++ b/coverage-tool/coverage-reporting/merge.sh @@ -365,6 +365,8 @@ help_message=$(cat < 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)"