mirror of
https://gitlab.com/apparmor/apparmor.git
synced 2025-03-04 16:35:02 +01:00
0f3c860768
Similar to the profiles/ check using the python utilities, the tests for the python utilities were not including the path for the swig libapparmor library in the LD_LIBRARY_PATH variable, only in PYTHONPATH. This commit fixes that, renaming the variable used for the built libapparmor check. v2: - actually use the LIBAPPARMOR_PATH variable when defining LD_LIBRARY_PATH Bug: https://gitlab.com/apparmor/apparmor/-/issues/98 Signed-off-by: Steve Beattie <steve.beattie@canonical.com> Acked-by: John Johansen <john.johansen@canonical.com> MR: https://gitlab.com/apparmor/apparmor/-/merge_requests/586
94 lines
3.8 KiB
Makefile
94 lines
3.8 KiB
Makefile
# ----------------------------------------------------------------------
|
|
# Copyright (c) 1999, 2004-2009 NOVELL (All rights reserved)
|
|
# Copyright (c) 2010-2014 Canonical Ltd.
|
|
#
|
|
# This program is free software; you can redistribute it and/or
|
|
# modify it under the terms of version 2 of the GNU General Public
|
|
# License published by the Free Software Foundation.
|
|
#
|
|
# This program is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with this program; if not, contact Novell, Inc.
|
|
# ----------------------------------------------------------------------
|
|
NAME = apparmor-utils
|
|
all:
|
|
COMMONDIR=../../common/
|
|
|
|
include $(COMMONDIR)/Make.rules
|
|
|
|
ifdef USE_SYSTEM
|
|
LD_LIBRARY_PATH=
|
|
PYTHONPATH=
|
|
CONFDIR=
|
|
BASEDIR=
|
|
PARSER=
|
|
else
|
|
# PYTHON_DIST_BUILD_PATH based on libapparmor/swig/python/test/Makefile.am
|
|
PYTHON_DIST_BUILD_PATH = ../../libraries/libapparmor/swig/python/build/$$($(PYTHON) -c "import distutils.util; import platform; print(\"lib.%s-%s\" %(distutils.util.get_platform(), platform.python_version()[:3]))")
|
|
LIBAPPARMOR_PATH=../../libraries/libapparmor/src/.libs/
|
|
LD_LIBRARY_PATH=$(LIBAPPARMOR_PATH):$(PYTHON_DIST_BUILD_PATH)
|
|
PYTHONPATH=..:$(PYTHON_DIST_BUILD_PATH)
|
|
CONFDIR=$(CURDIR)
|
|
BASEDIR=../../profiles/apparmor.d
|
|
PARSER=../../parser/apparmor_parser
|
|
endif
|
|
|
|
.PHONY: __libapparmor __parser
|
|
__libapparmor:
|
|
ifndef USE_SYSTEM
|
|
@if [ ! -f $(LIBAPPARMOR_PATH)libapparmor.so ]; then \
|
|
echo "error: $(LIBAPPARMOR_PATH)libapparmor.so is missing. Pick one of these possible solutions:" 1>&2; \
|
|
echo " 1) Build against the in-tree libapparmor by building it first and then trying again. See the top-level README for help." 1>&2; \
|
|
echo " 2) Build against the system libapparmor by adding USE_SYSTEM=1 to your make command." 1>&2; \
|
|
exit 1; \
|
|
fi
|
|
endif
|
|
|
|
__parser:
|
|
ifndef USE_SYSTEM
|
|
@if [ ! -f $(PARSER) ]; then \
|
|
echo "error: $(PARSER) is missing. Pick one of these possible solutions:" 1>&2; \
|
|
echo " 1) Test using the in-tree parser by building it first and then trying again. See the top-level README for help." 1>&2; \
|
|
echo " 2) Test using the system parser by adding USE_SYSTEM=1 to your make command." 1>&2; \
|
|
exit 1; \
|
|
fi
|
|
endif
|
|
|
|
COVERAGE_OMIT=test-*.py,common_test.py
|
|
ifneq ($(COVERAGE_OUT), )
|
|
HTML_COVR_ARGS=-d $(COVERAGE_OUT)
|
|
endif
|
|
|
|
# use make COVERAGE_IGNORE_FAILURES=true coverage to build coverage data even if some tests fail
|
|
ifeq ($(COVERAGE_IGNORE_FAILURES), true)
|
|
COVERAGE_IGNORE_FAILURES_CMD=true
|
|
else
|
|
COVERAGE_IGNORE_FAILURES_CMD=set -e
|
|
endif
|
|
|
|
.PHONY: clean check coverage coverage-report coverage-html
|
|
ifndef VERBOSE
|
|
.SILENT: clean check .coverage coverage coverage-report coverage-html
|
|
endif
|
|
|
|
clean:
|
|
rm -rf __pycache__/ .coverage htmlcov
|
|
|
|
check: __libapparmor __parser
|
|
export PYTHONPATH=$(PYTHONPATH) LD_LIBRARY_PATH=$(LD_LIBRARY_PATH) LC_ALL=C __AA_CONFDIR=$(CONFDIR) __AA_BASEDIR=$(BASEDIR) __AA_PARSER=$(PARSER) ; $(foreach test, $(wildcard test-*.py), echo ; echo === $(test) === ; $(call pyalldo, $(test)))
|
|
|
|
.coverage: $(wildcard ../aa-* ../apparmor/*.py test-*.py) __libapparmor __parser
|
|
export PYTHONPATH=$(PYTHONPATH) LD_LIBRARY_PATH=$(LD_LIBRARY_PATH) LC_ALL=C __AA_CONFDIR=$(CONFDIR) __AA_BASEDIR=$(BASEDIR) __AA_PARSER=$(PARSER) ; $(COVERAGE_IGNORE_FAILURES_CMD) ; $(foreach test, $(wildcard test-*.py), echo ; echo === $(test) === ; $(PYTHON) -m coverage run --branch -p $(test); )
|
|
$(PYTHON) -m coverage combine
|
|
|
|
coverage: .coverage
|
|
|
|
coverage-report: .coverage
|
|
$(PYTHON) -m coverage report --omit="$(COVERAGE_OMIT)"
|
|
|
|
coverage-html: .coverage
|
|
$(PYTHON) -m coverage html --omit="$(COVERAGE_OMIT)" $(HTML_COVR_ARGS)
|