diff options
| author | Zdenek Kabelac <zkabelac@redhat.com> | 2023-05-10 16:17:38 +0200 |
|---|---|---|
| committer | Zdenek Kabelac <zkabelac@redhat.com> | 2023-05-10 16:19:46 +0200 |
| commit | bf794b66f412765e49c4d79a4bb95b454f2357fc (patch) | |
| tree | 0fbe88430d7a6467997eee2e0150f01bd60bc8ac | |
| parent | bc28082b990bf752a2ce6ffa13aff9452c655ab8 (diff) | |
| download | lvm2-bf794b66f412765e49c4d79a4bb95b454f2357fc.tar.gz | |
tests: more updates for 300M xfs
Fix some sizing for larger xfs testing.
Also fix resize of reiserfs which requires resize_fsadm.
| -rw-r--r-- | test/shell/fsadm-crypt-fsresize.sh | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/test/shell/fsadm-crypt-fsresize.sh b/test/shell/fsadm-crypt-fsresize.sh index b2847928f..da5688610 100644 --- a/test/shell/fsadm-crypt-fsresize.sh +++ b/test/shell/fsadm-crypt-fsresize.sh @@ -20,7 +20,7 @@ export LVM_TEST_PREFER_BRD=0 . lib/inittest -aux prepare_vg 1 400 +aux prepare_vg 1 1100 # Tests require a libblkid version that shows FSLASTBLOCK which mkfs.ext4 || skip @@ -299,8 +299,10 @@ test_xfs_small_shrink() { test_reiserfs_resize() { mkfs.reiserfs -s 513 -f "$3" - fsadm --lvresize resize $1 30M - lvresize -L+10M --fs resize $1 + fsadm -y --lvresize resize $1 30M + # resize fs does not support resiserfs and requires resize_fsadm + not lvresize -L+10M --fs resize $1 + lvresize -L+10M --fs resize_fsadm $1 fsadm --lvresize -y resize $1 10M fscheck_reiserfs "$3" @@ -314,8 +316,9 @@ test_reiserfs_resize() { test_reiserfs_small_shrink() { mkfs.reiserfs -s 513 -f "$3" - lvresize -y -L-1 --fs resize $1 - lvresize -y -L-1 --fs resize $1 + not lvresize -y -L-1 --fs resize $1 + lvresize -y -L-1 --fs resize_fsadm $1 + lvresize -y -L-1 --fs resize_fsadm $1 fscheck_reiserfs "$3" } @@ -569,12 +572,10 @@ if check_missing ext3; then fi if check_missing xfs; then - lvresize -r -y -L310M $vg_lv + lvresize --fs ignore -y -L325M $vg_lv cryptsetup resize $CRYPT_NAME test_xfs_resize "$vg_lv" "$dev_vg_lv" "$CRYPT_DEV" - lvresize --fs ignore -y -L325M $vg_lv - cryptsetup resize $CRYPT_NAME test_xfs_inactive "$vg_lv2" "$dev_vg_lv2" "$CRYPT_DEV2" "$CRYPT_NAME2" |