From 5b1c5b88786297a8582c8ad211289a090f8e8435 Mon Sep 17 00:00:00 2001 From: David Sterba Date: Mon, 20 Jul 2015 17:31:43 +0200 Subject: btrfs-progs: inspect: add command min-dev-size Previously in 'filesystem resize get_min_size', now 'inspect-internal min-dev-size'. We'd like to avoid cluttering the 'resize' syntax further. The test has been updated to exercise the new option. Signed-off-by: David Sterba --- tests/misc-tests/004-shrink-fs/test.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'tests/misc-tests/004-shrink-fs') diff --git a/tests/misc-tests/004-shrink-fs/test.sh b/tests/misc-tests/004-shrink-fs/test.sh index 393cccf5..b1321520 100755 --- a/tests/misc-tests/004-shrink-fs/test.sh +++ b/tests/misc-tests/004-shrink-fs/test.sh @@ -9,14 +9,15 @@ source $TOP/tests/common check_prereq mkfs.btrfs setup_root_helper +# Optionally take id of the device to shrink shrink_test() { - min_size=$($SUDO_HELPER $TOP/btrfs filesystem resize get_min_size $TEST_MNT) - if [ $? != 0 ]; then - _fail "Failed to get minimum size" - fi + min_size=$(run_check_stdout $SUDO_HELPER $TOP/btrfs inspect-internal min-dev-size ${1:+--id $1} $TEST_MNT) min_size=$(echo $min_size | cut -d ' ' -f 1) echo "min size = ${min_size}" >> $RESULTS + if [ -z "$min_size" ]; then + _fail "Failed to parse minimum size" + fi run_check $SUDO_HELPER $TOP/btrfs filesystem resize $min_size $TEST_MNT } @@ -63,7 +64,7 @@ done run_check $SUDO_HELPER $TOP/btrfs balance start -mconvert=single \ -sconvert=single -f $TEST_MNT for ((i = 1; i <= 3; i++)); do - shrink_test + shrink_test 1 done run_check $SUDO_HELPER umount $TEST_MNT -- cgit v1.2.3