fixes/debugs

diff --git a/Makefile b/Makefile
index b90144b606f43eeba29aaa35822719518181196c..af772ae918eaa43c4c5818e575398a15632dff5c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -177,6 +177,8 @@ find_coverage_xml = $(or \
 
 CHECK_COVERAGE = $(if $(call find_coverage_xml,$(1)), \
        echo "" ; \
+       echo "Debug: WILDCARD=$(wildcard $(1)/*/*/cobertura.xml)" ; \
+       echo "Debug: MERGED_FILTER=$(filter %/merged/kcov-merged/cobertura.xml, $(wildcard $(1)/*/*/cobertura.xml))" ; \
        echo "Report for: file://$(abspath $(dir $(call find_coverage_xml,$(1))))/index.html" ; \
        XML_FILE="$(call find_coverage_xml,$(1))" PATT="$(2)" FAIL_UNDER="$(3)" python3 tests/coverage_report.py, \
        echo "" ; \

diff --git a/tests/installer-test-logic.sh b/tests/installer-test-logic.sh
index 5a7c47a88c1a8a2405cb07dd00ddf4bd2061acdf..ae3a05e8ddf3e03fdd3e636336365eb78f3fcd36 100755 (executable)
--- a/tests/installer-test-logic.sh
+++ b/tests/installer-test-logic.sh
@@ -24,8 +24,8 @@ ln -s "$REPO_ROOT/git-remote-gcrypt" "$SANDBOX/git-remote-gcrypt"
 ln -s "$REPO_ROOT/utils" "$SANDBOX/utils"
 cp -r "$REPO_ROOT/completions" "$SANDBOX/completions"
 # Mock gen_docs.sh to avoid kcov tracing issues with child process
-echo '#!/bin/sh' > "$SANDBOX/completions/gen_docs.sh"
-echo 'exit 0' >> "$SANDBOX/completions/gen_docs.sh"
+echo '#!/bin/sh' >"$SANDBOX/completions/gen_docs.sh"
+echo 'exit 0' >>"$SANDBOX/completions/gen_docs.sh"
 chmod +x "$SANDBOX/completions/gen_docs.sh"
 # Copy README as it might be edited/checked
 cp "$REPO_ROOT/README.rst" "$SANDBOX/"

diff --git a/tests/system-test-multikey.sh b/tests/system-test-multikey.sh
index 03b07d137c9e1be65530a46c657866a9a5267165..2d10c07a10d80205962e2243ed25491c86cc8d96 100755 (executable)
--- a/tests/system-test-multikey.sh
+++ b/tests/system-test-multikey.sh
@@ -20,7 +20,9 @@ print_info "GPG Version detected: $gpg_ver"
 
 # Function to check if version strictly less than
 version_lt() {
-       [ "$1" = "$2" ] && return 1 || :
+       if [ "$1" = "$2" ]; then
+               return 1
+       fi
        [ "$1" = "$(echo -e "$1\n$2" | sort -V | head -n1)" ]
 }