mirror of
git://sourceware.org/git/lvm2.git
synced 2025-03-10 16:58:47 +03:00
tests: more updates for 300M xfs
Fix some sizing for larger xfs testing. Also fix resize of reiserfs which requires resize_fsadm.
This commit is contained in:
parent
bc28082b99
commit
bf794b66f4
@ -20,7 +20,7 @@ export LVM_TEST_PREFER_BRD=0
|
|||||||
|
|
||||||
. lib/inittest
|
. lib/inittest
|
||||||
|
|
||||||
aux prepare_vg 1 400
|
aux prepare_vg 1 1100
|
||||||
|
|
||||||
# Tests require a libblkid version that shows FSLASTBLOCK
|
# Tests require a libblkid version that shows FSLASTBLOCK
|
||||||
which mkfs.ext4 || skip
|
which mkfs.ext4 || skip
|
||||||
@ -299,8 +299,10 @@ test_xfs_small_shrink() {
|
|||||||
test_reiserfs_resize() {
|
test_reiserfs_resize() {
|
||||||
mkfs.reiserfs -s 513 -f "$3"
|
mkfs.reiserfs -s 513 -f "$3"
|
||||||
|
|
||||||
fsadm --lvresize resize $1 30M
|
fsadm -y --lvresize resize $1 30M
|
||||||
lvresize -L+10M --fs resize $1
|
# 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
|
fsadm --lvresize -y resize $1 10M
|
||||||
|
|
||||||
fscheck_reiserfs "$3"
|
fscheck_reiserfs "$3"
|
||||||
@ -314,8 +316,9 @@ test_reiserfs_resize() {
|
|||||||
test_reiserfs_small_shrink() {
|
test_reiserfs_small_shrink() {
|
||||||
mkfs.reiserfs -s 513 -f "$3"
|
mkfs.reiserfs -s 513 -f "$3"
|
||||||
|
|
||||||
lvresize -y -L-1 --fs resize $1
|
not lvresize -y -L-1 --fs resize $1
|
||||||
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"
|
fscheck_reiserfs "$3"
|
||||||
}
|
}
|
||||||
@ -569,12 +572,10 @@ if check_missing ext3; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
if check_missing xfs; then
|
if check_missing xfs; then
|
||||||
lvresize -r -y -L310M $vg_lv
|
lvresize --fs ignore -y -L325M $vg_lv
|
||||||
cryptsetup resize $CRYPT_NAME
|
cryptsetup resize $CRYPT_NAME
|
||||||
|
|
||||||
test_xfs_resize "$vg_lv" "$dev_vg_lv" "$CRYPT_DEV"
|
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"
|
test_xfs_inactive "$vg_lv2" "$dev_vg_lv2" "$CRYPT_DEV2" "$CRYPT_NAME2"
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user