mir/apparmor
2
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor synced 2025-08-31 06:16:03 +00:00
Code Issues Releases Wiki Activity

tests: add more details when reporting onexec failures

Browse Source 
Based on a patch by John Johansen <john.johansen@canonical.com>

Add more details to the checks in the regression tests onexec tests,
to make debugging failures easier. Also, use more local variables
to indicate what and how many arguments are expected to the onexec
check_* functions.

Signed-off-by: Steve Beattie <steve@nxnw.org>
Acked-by: Tyler Hicks <tyhicks@canonical.com>
This commit is contained in:
Steve Beattie
2016-03-19 01:32:40 -07:00
parent c8fe0b2518
commit 91022dae85
1 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
tests/regression/apparmor/onexec.sh
View File

@@ -37,19 +37,22 @@ check_exec()
{
local rc
local actual
actual=`cat /proc/$1/attr/exec 2>/dev/null`
local desc="$1"
local pid="$2"
local expected="$3"
actual=`cat /proc/${pid}/attr/exec 2>/dev/null`
rc=$?
# /proc/$1/attr/exec returns invalid argument if onexec has not been called
# /proc/${pid}/attr/exec returns invalid argument if onexec has not been called
if [ $rc -ne 0 ] ; then
if [ "$2" == "nochange" ] ; then
if [ "${expected}" == "nochange" ] ; then
return 0
fi
echo "ONEXEC - exec transition not set"
echo "ONEXEC (${desc}) - exec transition not set"
return $rc
fi
if [ "${actual% (*)}" != "$2" ] ; then
echo "ONEXEC - check exec '${actual% (*)}' != expected '$2'"
if [ "${actual% (*)}" != "${expected}" ] ; then
echo "ONEXEC (${desc}) - check exec '${actual% (*)}' != expected '${expected}'"
return 1
fi
@@ -60,16 +63,23 @@ check_current()
{
local rc
local actual
actual=`cat /proc/$1/attr/current 2>/dev/null`
local desc="$1"
local pid="$2"
local expected="$3"
actual=`cat /proc/${pid}/attr/current 2>/dev/null`
rc=$?
# /proc/$1/attr/current return enoent if the onexec process already exited due to error
# /proc/${pid}/attr/current return enoent if the onexec process already exited due to error
if [ $rc -ne 0 ] ; then
# These assume a check has already been done to see if the
# task is still around
echo -n "ONEXEC - check current ($1): "
cat /proc/${pid}/attr/current
return $rc
fi
if [ "${actual% (*)}" != "$2" ] ; then
echo "ONEXEC - check current '${actual% (*)}' != expected '$2'"
if [ "${actual% (*)}" != "${expected}" ] ; then
echo "ONEXEC - check current (${desc}) '${actual% (*)}' != expected '${expected}'"
return 1
fi
@@ -93,12 +103,12 @@ do_test()
# give the onexec process a chance to run
sleep 0.05
if ! check_current $_pid $prof ; then
if ! check_current "${desc}" $_pid $prof ; then
checktestfg
return
fi
if ! check_exec $_pid $target_prof ; then
if ! check_exec "${desc}" $_pid $target_prof ; then
checktestfg
return
fi