mir/apparmor
2
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor synced 2025-09-02 23:35:37 +00:00
Code Issues Releases Wiki Activity

Regression testsuite: remove a bit more code that's no longer needed

Browse Source 
in prologue.inc.

Signed-off-by: Steve Beattie <sbeattie@ubuntu.com>
Acked-by: John Johansen <john.johansen@canonical.com>
This commit is contained in:
Steve Beattie
2012-01-12 12:37:24 +01:00
parent 1ef2d7e757
commit cec0d50cfd
1 changed files with 9 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
tests/regression/apparmor/prologue.inc
View File

@@ -241,22 +241,7 @@ emit_profile()
trap "error_handler" ERR trap "error_handler" ERR
fi fi
local wflag #global name outfile profile profilenames
#global name outfile profile dynlibs profilenames
wflag=""
mkflags="${wflag} ${escapeflag}"
if [ "$nodefaults" -eq 1 ]
then
mkflags="${mkflags} -N"
fi
if [ "$noimage" -eq 1 ]
then
mkflags="${mkflags} -I"
fi
name=$1; shift 1 name=$1; shift 1
@@ -274,22 +259,19 @@ fi
local num_emitted imagename hat args arg names1 names2 local num_emitted imagename hat args arg names1 names2
#global complainflag escapeflag nodefaults profile profilenames #global complainflag escapeflag nodefaults profile profilenames
local hat_string="hat:"
complainflag="" complainflag=""
escapeflag="" mkflags=""
nodefaults=0
noimage=0
while /bin/true while /bin/true
do do
case "$1" in case "$1" in
"-C") complainflag="-C" "-C") complainflag="-C"
;; ;;
"-E") escapeflag="-E" "-E") mkflags="${mkflags} -E"
;; ;;
"-N") nodefaults=1 "-N") mkflags="${mkflags} -N"
;; ;;
"-I") noimage=1 "-I") mkflags="${mkflags} -I"
;; ;;
*) break *) break
;; ;;
@@ -335,7 +317,7 @@ fi
arg="$1" arg="$1"
shift shift
# -- is the seperator between profiles # -- is the separator between profiles
if [ "$arg" == "--" ] if [ "$arg" == "--" ]
then then
eval emit_profile \"$imagename\" \ eval emit_profile \"$imagename\" \