mirror of
https://git.code.sf.net/p/linux-ima/ima-evm-utils
synced 2025-04-27 22:32:31 +02:00
Adapt fsverity.test to be able to run in a new testing environment
Adapt fsverity.test by adding calls to the testing environment API in functions.sh. If TST_ENV is set, create a new environment and run the kernel specified with the TST_KERNEL environment variable. Otherwise, keep the current behavior. Signed-off-by: Roberto Sassu <roberto.sassu@huawei.com> Reviewed-by: Stefan Berger <stefanb@linux.ibm.com> Signed-off-by: Mimi Zohar <zohar@linux.ibm.com>
This commit is contained in:
parent
cf832d72f9
commit
0bccb5412c
@ -47,7 +47,7 @@ FSVERITY="$(which fsverity)"
|
|||||||
_require dd mkfs blkid e2fsck tune2fs evmctl setfattr
|
_require dd mkfs blkid e2fsck tune2fs evmctl setfattr
|
||||||
./gen-keys.sh >/dev/null 2>&1
|
./gen-keys.sh >/dev/null 2>&1
|
||||||
|
|
||||||
trap '_report_exit_and_cleanup cleanup' SIGINT SIGTERM EXIT
|
trap '_report_exit_and_cleanup _cleanup_env cleanup' SIGINT SIGTERM EXIT
|
||||||
|
|
||||||
cleanup() {
|
cleanup() {
|
||||||
if [ -e $TST_MNT ]; then
|
if [ -e $TST_MNT ]; then
|
||||||
@ -308,6 +308,15 @@ measure-ima() {
|
|||||||
return "$error"
|
return "$error"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# Run in the new environment if TST_ENV is set.
|
||||||
|
_run_env "$TST_KERNEL" "$PWD/$(basename "$0")" "TST_ENV=$TST_ENV TST_KERNEL=$TST_KERNEL PATH=$PATH LD_LIBRARY_PATH=$LD_LIBRARY_PATH VERBOSE=$VERBOSE"
|
||||||
|
|
||||||
|
# Exit from the creator of the new environment.
|
||||||
|
_exit_env "$TST_KERNEL"
|
||||||
|
|
||||||
|
# Mount filesystems in the new environment.
|
||||||
|
_init_env
|
||||||
|
|
||||||
# Dependency on being able to read and write the IMA policy file.
|
# Dependency on being able to read and write the IMA policy file.
|
||||||
# Requires both CONFIG_IMA_WRITE_POLICY, CONFIG_IMA_READ_POLICY be
|
# Requires both CONFIG_IMA_WRITE_POLICY, CONFIG_IMA_READ_POLICY be
|
||||||
# enabled.
|
# enabled.
|
||||||
|
Loading…
x
Reference in New Issue
Block a user