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

Merge Fix swap regression test on btrfs

Browse source 
As per !1462 it turns out that the swap regression test on btrfs also needs special casing in order to work properly. This is an analogous patch to check for btrfs.

Signed-off-by: Ryan Lee <ryan.lee@canonical.com>

MR: https://gitlab.com/apparmor/apparmor/-/merge_requests/1463
Approved-by: Georgia Garcia <georgia.garcia@canonical.com>
Merged-by: Georgia Garcia <georgia.garcia@canonical.com>
This commit is contained in:
Georgia Garcia 2024-12-13 20:32:01 +00:00
commit 6d7b5df947
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
tests/regression/apparmor/swap.sh
View file

@ -31,7 +31,8 @@ swap_file=$tmpdir/swapfile
# check if we can run the test in tmpdir # check if we can run the test in tmpdir
fstype=$(stat -f --format '%T' "${tmpdir}") fstype=$(stat -f --format '%T' "${tmpdir}")
if [ "${fstype}" = "tmpfs" ] || [ "${fstype}" = "zfs" ] ; then if [ "${fstype}" = "tmpfs" ] || [ "${fstype}" = "zfs" ] \
|| [ "${fstype}" = "btrfs" ]; then
# create a mountpoint not tmpfs or zfs # create a mountpoint not tmpfs or zfs
mount_file=$tmpdir/mountfile mount_file=$tmpdir/mountfile
mount_point=$tmpdir/mountpoint mount_point=$tmpdir/mountpoint