On Fri, 2019-04-05 at 18:52 +0200, Petr Vorel wrote:
> to work the same way as setup
>
> Signed-off-by: Petr Vorel <pvorel@xxxxxxx>
> ---
> testcases/kernel/security/integrity/ima/tests/ima_setup.sh | 6 +++++-
> .../kernel/security/integrity/ima/tests/ima_violations.sh | 2 --
> 2 files changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/testcases/kernel/security/integrity/ima/tests/ima_setup.sh b/testcases/kernel/security/integrity/ima/tests/ima_setup.sh
> index 52551190a..cbded42c2 100644
> --- a/testcases/kernel/security/integrity/ima/tests/ima_setup.sh
> +++ b/testcases/kernel/security/integrity/ima/tests/ima_setup.sh
> @@ -20,7 +20,8 @@
> TST_TESTFUNC="test"
> TST_SETUP_CALLER="$TST_SETUP"
> TST_SETUP="ima_setup"
> -TST_CLEANUP="${TST_CLEANUP:-ima_cleanup}"
> +TST_CLEANUP_CALLER="$TST_CLEANUP"
> +TST_CLEANUP="ima_cleanup"
It seems to be working, but defining TST_SETUP and TST_CLEANUP after
defining the respective _CALLER looks strange. The _CALLER's string
must be empty.
> TST_NEEDS_TMPDIR=1
> TST_NEEDS_ROOT=1
>
> @@ -95,6 +96,9 @@ ima_setup()
> ima_cleanup()
> {
> local dir
> +
> + [ -n "$TST_CLEANUP_CALLER" ] && $TST_CLEANUP_CALLER
> +
Is something else setting TST_CLEANUP_CALLER?
> for dir in $UMOUNT; do
> umount $dir
> done
> diff --git a/testcases/kernel/security/integrity/ima/tests/ima_violations.sh b/testcases/kernel/security/integrity/ima/tests/ima_violations.sh
> index 74223c221..a44bd1230 100755
> --- a/testcases/kernel/security/integrity/ima/tests/ima_violations.sh
> +++ b/testcases/kernel/security/integrity/ima/tests/ima_violations.sh
> @@ -51,8 +51,6 @@ cleanup()
> {
> [ "$PRINTK_RATE_LIMIT" != "0" ] && \
> sysctl -wq kernel.printk_ratelimit=$PRINTK_RATE_LIMIT
> -
> - ima_cleanup
> }
>
> open_file_read()
