diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 941b01ba6..5cc86d464 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -112,7 +112,7 @@ shellcheck: extends: - .ubuntu-before_script script: - - apt-get install --no-install-recommends -y file shellcheck xmlstarlet + - apt-get install --no-install-recommends -y python3-minimal file shellcheck xmlstarlet - shellcheck --version - './tests/bin/shellcheck-tree --format=checkstyle | xmlstarlet tr tests/checkstyle2junit.xslt diff --git a/parser/apparmor.systemd b/parser/apparmor.systemd index 09d579245..ccdad3b49 100644 --- a/parser/apparmor.systemd +++ b/parser/apparmor.systemd @@ -17,6 +17,8 @@ APPARMOR_FUNCTIONS=/lib/apparmor/rc.apparmor.functions +# This function is used in rc.apparmor.functions +# shellcheck disable=SC2317 aa_action() { echo "$1" @@ -25,36 +27,50 @@ aa_action() return $? } +# This function is used in rc.apparmor.functions +# shellcheck disable=SC2317 aa_log_warning_msg() { echo "Warning: $*" } +# This function is used in rc.apparmor.functions +# shellcheck disable=SC2317 aa_log_failure_msg() { echo "Error: $*" } +# This function is used in rc.apparmor.functions +# shellcheck disable=SC2317 aa_log_action_start() { echo "$@" } +# This function is used in rc.apparmor.functions +# shellcheck disable=SC2317 aa_log_action_end() { printf "" } +# This function is used in rc.apparmor.functions +# shellcheck disable=SC2317 aa_log_daemon_msg() { echo "$@" } +# This function is used in rc.apparmor.functions +# shellcheck disable=SC2317 aa_log_skipped_msg() { echo "Skipped: $*" } +# This function is used in rc.apparmor.functions +# shellcheck disable=SC2317 aa_log_end_msg() { printf "" diff --git a/utils/test/Makefile b/utils/test/Makefile index bc9f49254..3eca84e72 100644 --- a/utils/test/Makefile +++ b/utils/test/Makefile @@ -61,7 +61,7 @@ ifndef USE_SYSTEM fi endif -COVERAGE_OMIT=test-*.py,common_test.py +COVERAGE_OMIT=test-*.py,common_test.py,*/dist-packages/* ifneq ($(COVERAGE_OUT), ) HTML_COVR_ARGS=-d $(COVERAGE_OUT) endif