mirrors/apparmor
1
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor.git synced 2025-03-04 08:24:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

use aa-logprof --configdir ../utils in profile testsuite

Browse source 
(except if USE_SYSTEM is given)

This also needs an additional parser path in utils/test/logprof.conf,
which then needs an update in test-config.py.
This commit is contained in:
Christian Boltz 2020-10-25 15:53:29 +01:00
parent ab6e9b2de2
commit 87eec0d62d
Failed to generate hash of commit
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
profiles/Makefile
View file

@ -47,7 +47,7 @@ else
PYTHONPATH=../utils/:$(PYTHON_DIST_BUILD_PATH) PYTHONPATH=../utils/:$(PYTHON_DIST_BUILD_PATH)
PARSER?=../parser/apparmor_parser PARSER?=../parser/apparmor_parser
# use ../utils logprof # use ../utils logprof
LOGPROF?=LD_LIBRARY_PATH=$(LD_LIBRARY_PATH) PYTHONPATH=$(PYTHONPATH) $(PYTHON) ../utils/aa-logprof LOGPROF?=LD_LIBRARY_PATH=$(LD_LIBRARY_PATH) PYTHONPATH=$(PYTHONPATH) $(PYTHON) ../utils/aa-logprof --configdir ../utils/test/
endif endif
# $(PWD) is wrong when using "make -C profiles" - explicitely set it here to get the right value # $(PWD) is wrong when using "make -C profiles" - explicitely set it here to get the right value

2
utils/test/logprof.conf
View file

@ -14,7 +14,7 @@
inactive_profiledir = ../../profiles/apparmor/profiles/extra inactive_profiledir = ../../profiles/apparmor/profiles/extra
logfiles = /var/log/audit/audit.log /var/log/syslog /var/log/messages logfiles = /var/log/audit/audit.log /var/log/syslog /var/log/messages
parser = ../../parser/apparmor_parser parser = ../../parser/apparmor_parser ../parser/apparmor_parser
ldd = /usr/bin/ldd ldd = /usr/bin/ldd
logger = /bin/logger /usr/bin/logger logger = /bin/logger /usr/bin/logger

2
utils/test/test-config.py
View file

@ -24,7 +24,7 @@ class Test(unittest.TestCase):
conf = ini_config.read_config('logprof.conf') conf = ini_config.read_config('logprof.conf')
logprof_sections = ['settings', 'qualifiers', 'required_hats', 'defaulthat', 'globs'] logprof_sections = ['settings', 'qualifiers', 'required_hats', 'defaulthat', 'globs']
logprof_sections_options = ['profiledir', 'inactive_profiledir', 'logfiles', 'parser', 'ldd', 'logger', 'default_owner_prompt', 'custom_includes'] logprof_sections_options = ['profiledir', 'inactive_profiledir', 'logfiles', 'parser', 'ldd', 'logger', 'default_owner_prompt', 'custom_includes']
logprof_settings_parser = '../../parser/apparmor_parser' logprof_settings_parser = '../../parser/apparmor_parser ../parser/apparmor_parser'
self.assertEqual(conf.sections(), logprof_sections) self.assertEqual(conf.sections(), logprof_sections)
self.assertEqual(conf.options('settings'), logprof_sections_options) self.assertEqual(conf.options('settings'), logprof_sections_options)