diff options
author | David Sterba <dsterba@suse.com> | 2017-01-24 17:59:47 +0100 |
---|---|---|
committer | David Sterba <dsterba@suse.com> | 2017-01-27 12:20:43 +0100 |
commit | 21821424715214a6252708f2322e2f4882c967ab (patch) | |
tree | a054fe4d90eae6cfcf6f08f354aebe116d2fdbc7 /tests/cli-tests | |
parent | 55e3a601951302641c4fd5e148f46449acc449c2 (diff) |
btrfs-progs: tests: add variable quotation to cli-tests
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'tests/cli-tests')
-rwxr-xr-x | tests/cli-tests/001-btrfs/test.sh | 20 | ||||
-rwxr-xr-x | tests/cli-tests/002-balance-full-no-filters/test.sh | 12 | ||||
-rwxr-xr-x | tests/cli-tests/003-fi-resize-args/test.sh | 32 | ||||
-rwxr-xr-x | tests/cli-tests/004-send-parent-multi-subvol/test.sh | 6 | ||||
-rwxr-xr-x | tests/cli-tests/005-qgroup-show/test.sh | 16 |
5 files changed, 43 insertions, 43 deletions
diff --git a/tests/cli-tests/001-btrfs/test.sh b/tests/cli-tests/001-btrfs/test.sh index 560e4890..c680604b 100755 --- a/tests/cli-tests/001-btrfs/test.sh +++ b/tests/cli-tests/001-btrfs/test.sh @@ -1,18 +1,18 @@ #!/bin/bash # test commands of btrfs -source $TOP/tests/common +source "$TOP/tests/common" check_prereq btrfs # returns 1 run_mayfail $TOP/btrfs || true -run_check $TOP/btrfs version -run_check $TOP/btrfs version -- -run_check $TOP/btrfs help -run_check $TOP/btrfs help -- -run_check $TOP/btrfs help --full -run_check $TOP/btrfs --help -run_check $TOP/btrfs --help --full -run_check $TOP/btrfs --version -run_check $TOP/btrfs --version --help +run_check "$TOP/btrfs" version +run_check "$TOP/btrfs" version -- +run_check "$TOP/btrfs" help +run_check "$TOP/btrfs" help -- +run_check "$TOP/btrfs" help --full +run_check "$TOP/btrfs" --help +run_check "$TOP/btrfs" --help --full +run_check "$TOP/btrfs" --version +run_check "$TOP/btrfs" --version --help diff --git a/tests/cli-tests/002-balance-full-no-filters/test.sh b/tests/cli-tests/002-balance-full-no-filters/test.sh index c2757f24..81a719eb 100755 --- a/tests/cli-tests/002-balance-full-no-filters/test.sh +++ b/tests/cli-tests/002-balance-full-no-filters/test.sh @@ -2,7 +2,7 @@ # # coverage of balance --full-balance -source $TOP/tests/common +source "$TOP/tests/common" check_prereq mkfs.btrfs check_prereq btrfs @@ -10,12 +10,12 @@ check_prereq btrfs setup_root_helper prepare_test_dev 2g -run_check $TOP/mkfs.btrfs -f $IMAGE +run_check "$TOP/mkfs.btrfs" -f "$IMAGE" run_check_mount_test_dev -run_check $SUDO_HELPER $TOP/btrfs balance start --full-balance $TEST_MNT -run_check $SUDO_HELPER $TOP/btrfs balance start $TEST_MNT -run_check $SUDO_HELPER $TOP/btrfs balance --full-balance $TEST_MNT -run_check $SUDO_HELPER $TOP/btrfs balance $TEST_MNT +run_check $SUDO_HELPER "$TOP/btrfs" balance start --full-balance "$TEST_MNT" +run_check $SUDO_HELPER "$TOP/btrfs" balance start "$TEST_MNT" +run_check $SUDO_HELPER "$TOP/btrfs" balance --full-balance "$TEST_MNT" +run_check $SUDO_HELPER "$TOP/btrfs" balance "$TEST_MNT" run_check_umount_test_dev diff --git a/tests/cli-tests/003-fi-resize-args/test.sh b/tests/cli-tests/003-fi-resize-args/test.sh index 2f136fa2..b835e078 100755 --- a/tests/cli-tests/003-fi-resize-args/test.sh +++ b/tests/cli-tests/003-fi-resize-args/test.sh @@ -2,7 +2,7 @@ # # test parsing of various resize arguments -source $TOP/tests/common +source "$TOP/tests/common" check_prereq mkfs.btrfs check_prereq btrfs @@ -10,37 +10,37 @@ check_prereq btrfs setup_root_helper prepare_test_dev 2g -run_check $TOP/mkfs.btrfs -f $IMAGE +run_check "$TOP/mkfs.btrfs" -f "$IMAGE" run_check_mount_test_dev # missing the one of the required arguments for sep in '' '--'; do - run_check_stdout $TOP/btrfs filesystem resize $sep | + run_check_stdout "$TOP/btrfs" filesystem resize $sep | grep -q "btrfs filesystem resize: too few arguments" - run_check_stdout $TOP/btrfs filesystem resize $sep $TEST_MNT | + run_check_stdout "$TOP/btrfs" filesystem resize $sep "$TEST_MNT" | grep -q "btrfs filesystem resize: too few arguments" - run_check_stdout $TOP/btrfs filesystem resize $sep -128M | + run_check_stdout "$TOP/btrfs" filesystem resize $sep -128M | grep -q "btrfs filesystem resize: too few arguments" - run_check_stdout $TOP/btrfs filesystem resize $sep +128M | + run_check_stdout "$TOP/btrfs" filesystem resize $sep +128M | grep -q "btrfs filesystem resize: too few arguments" - run_check_stdout $TOP/btrfs filesystem resize $sep 512M | + run_check_stdout "$TOP/btrfs" filesystem resize $sep 512M | grep -q "btrfs filesystem resize: too few arguments" - run_check_stdout $TOP/btrfs filesystem resize $sep 1:-128M | + run_check_stdout "$TOP/btrfs" filesystem resize $sep 1:-128M | grep -q "btrfs filesystem resize: too few arguments" - run_check_stdout $TOP/btrfs filesystem resize $sep 1:512M | + run_check_stdout "$TOP/btrfs" filesystem resize $sep 1:512M | grep -q "btrfs filesystem resize: too few arguments" - run_check_stdout $TOP/btrfs filesystem resize $sep 1:+128M | + run_check_stdout "$TOP/btrfs" filesystem resize $sep 1:+128M | grep -q "btrfs filesystem resize: too few arguments" done # valid resize for sep in '' '--'; do - run_check $SUDO_HELPER $TOP/btrfs filesystem resize $sep -128M $TEST_MNT - run_check $SUDO_HELPER $TOP/btrfs filesystem resize $sep +128M $TEST_MNT - run_check $SUDO_HELPER $TOP/btrfs filesystem resize $sep 512M $TEST_MNT - run_check $SUDO_HELPER $TOP/btrfs filesystem resize $sep 1:-128M $TEST_MNT - run_check $SUDO_HELPER $TOP/btrfs filesystem resize $sep 1:512M $TEST_MNT - run_check $SUDO_HELPER $TOP/btrfs filesystem resize $sep 1:+128M $TEST_MNT + run_check $SUDO_HELPER "$TOP/btrfs" filesystem resize $sep -128M "$TEST_MNT" + run_check $SUDO_HELPER "$TOP/btrfs" filesystem resize $sep +128M "$TEST_MNT" + run_check $SUDO_HELPER "$TOP/btrfs" filesystem resize $sep 512M "$TEST_MNT" + run_check $SUDO_HELPER "$TOP/btrfs" filesystem resize $sep 1:-128M "$TEST_MNT" + run_check $SUDO_HELPER "$TOP/btrfs" filesystem resize $sep 1:512M "$TEST_MNT" + run_check $SUDO_HELPER "$TOP/btrfs" filesystem resize $sep 1:+128M "$TEST_MNT" done run_check_umount_test_dev diff --git a/tests/cli-tests/004-send-parent-multi-subvol/test.sh b/tests/cli-tests/004-send-parent-multi-subvol/test.sh index e9ccf225..860f657a 100755 --- a/tests/cli-tests/004-send-parent-multi-subvol/test.sh +++ b/tests/cli-tests/004-send-parent-multi-subvol/test.sh @@ -2,7 +2,7 @@ # # minimal test for the following syntax: btrfs send -p parent subvol1 subvol2 -source $TOP/tests/common +source "$TOP/tests/common" check_prereq mkfs.btrfs check_prereq btrfs @@ -10,7 +10,7 @@ check_prereq btrfs setup_root_helper prepare_test_dev 2g -run_check $TOP/mkfs.btrfs -f $IMAGE +run_check "$TOP/mkfs.btrfs" -f "$IMAGE" run_check_mount_test_dev here=`pwd` @@ -26,7 +26,7 @@ run_check $SUDO_HELPER btrfs subvolume snapshot -r subv-parent subv-snap3 run_check truncate -s0 "$here"/send.stream run_check chmod a+w "$here"/send.stream -run_check $SUDO_HELPER $TOP/btrfs send -f "$here"/send.stream -p subv-snap1 subv-snap2 subv-snap3 +run_check $SUDO_HELPER "$TOP/btrfs" send -f "$here"/send.stream -p subv-snap1 subv-snap2 subv-snap3 cd "$here" || _fail "cannot chdir back to test directory" rm send.stream diff --git a/tests/cli-tests/005-qgroup-show/test.sh b/tests/cli-tests/005-qgroup-show/test.sh index 28c22c61..46d3c3a7 100755 --- a/tests/cli-tests/005-qgroup-show/test.sh +++ b/tests/cli-tests/005-qgroup-show/test.sh @@ -2,7 +2,7 @@ # # qgroup show behaviour when quotas are not enabled -source $TOP/tests/common +source "$TOP/tests/common" check_prereq mkfs.btrfs check_prereq btrfs @@ -10,12 +10,12 @@ check_prereq btrfs setup_root_helper prepare_test_dev 2g -run_check $TOP/mkfs.btrfs -f $IMAGE +run_check "$TOP/mkfs.btrfs" -f "$IMAGE" run_check_mount_test_dev -run_mayfail $TOP/btrfs qgroup show "$TEST_MNT" -run_mayfail $SUDO_HELPER $TOP/btrfs qgroup show "$TEST_MNT" -run_check $SUDO_HELPER $TOP/btrfs quota enable "$TEST_MNT" -run_mayfail $TOP/btrfs qgroup show "$TEST_MNT" -run_check $SUDO_HELPER $TOP/btrfs qgroup show "$TEST_MNT" -run_check $SUDO_HELPER $TOP/btrfs quota disable "$TEST_MNT" +run_mayfail "$TOP/btrfs" qgroup show "$TEST_MNT" +run_mayfail $SUDO_HELPER "$TOP/btrfs" qgroup show "$TEST_MNT" +run_check $SUDO_HELPER "$TOP/btrfs" quota enable "$TEST_MNT" +run_mayfail "$TOP/btrfs" qgroup show "$TEST_MNT" +run_check $SUDO_HELPER "$TOP/btrfs" qgroup show "$TEST_MNT" +run_check $SUDO_HELPER "$TOP/btrfs" quota disable "$TEST_MNT" run_check_umount_test_dev |