diff options
| author | Dimitri John Ledkov <xnox@ubuntu.com> | 2017-02-13 11:24:33 +0000 |
|---|---|---|
| committer | Dimitri John Ledkov <xnox@ubuntu.com> | 2017-02-13 11:24:33 +0000 |
| commit | 4305d024938113df5d73021a09eb2a991f54ca2f (patch) | |
| tree | d9e7ecc9db14bcc1394607a9e6c644a8b93e9bea /tests/mkfs-tests | |
| parent | e693f0e4ffb1776a05b78264ee3d93d5f07efede (diff) | |
New upstream release Closes: #849353, #817806, #854915, #845473
Diffstat (limited to 'tests/mkfs-tests')
4 files changed, 10 insertions, 9 deletions
diff --git a/tests/mkfs-tests/001-basic-profiles/test.sh b/tests/mkfs-tests/001-basic-profiles/test.sh index a6769214..0dc9a2bd 100755 --- a/tests/mkfs-tests/001-basic-profiles/test.sh +++ b/tests/mkfs-tests/001-basic-profiles/test.sh @@ -4,7 +4,6 @@ source $TOP/tests/common -check_prereq btrfs-show-super check_prereq mkfs.btrfs check_prereq btrfs @@ -33,12 +32,12 @@ cleanup_devices() for i in `seq $ndevs`; do truncate -s0 img$i done - run_check $SUDO_HELPER losetup --list + run_check $SUDO_HELPER losetup --all } test_get_info() { - run_check $TOP/btrfs-show-super $dev1 + run_check $SUDO_HELPER $TOP/btrfs inspect-internal dump-super $dev1 run_check $SUDO_HELPER $TOP/btrfs check $dev1 run_check $SUDO_HELPER mount $dev1 $TEST_MNT run_check $TOP/btrfs filesystem df $TEST_MNT diff --git a/tests/mkfs-tests/005-long-device-name-for-ssd/test.sh b/tests/mkfs-tests/005-long-device-name-for-ssd/test.sh index cff495e6..63fb1785 100755 --- a/tests/mkfs-tests/005-long-device-name-for-ssd/test.sh +++ b/tests/mkfs-tests/005-long-device-name-for-ssd/test.sh @@ -4,7 +4,6 @@ source $TOP/tests/common check_prereq mkfs.btrfs -check_prereq btrfs-show-super setup_root_helper prepare_test_dev @@ -33,7 +32,7 @@ run_check cat $rot # test run_check_stdout $SUDO_HELPER $TOP/mkfs.btrfs -f $@ $dmdev | grep -q 'SSD detected:.*yes' || _fail 'SSD not detected' -run_check $TOP/btrfs-show-super $dmdev +run_check $SUDO_HELPER $TOP/btrfs inspect-internal dump-super $dmdev # cleanup run_check $SUDO_HELPER dmsetup remove $dmname diff --git a/tests/mkfs-tests/006-partitioned-loopdev/test.sh b/tests/mkfs-tests/006-partitioned-loopdev/test.sh index 7c9fb829..12f37842 100755 --- a/tests/mkfs-tests/006-partitioned-loopdev/test.sh +++ b/tests/mkfs-tests/006-partitioned-loopdev/test.sh @@ -3,8 +3,12 @@ source $TOP/tests/common +if ! losetup --help | grep -q 'partscan'; then + _not_run "losetup --partscan not available" + exit 0 +fi + check_prereq mkfs.btrfs -check_prereq btrfs-show-super setup_root_helper @@ -19,7 +23,7 @@ base=$(basename $loopdev) # expect partitions named like loop0p1 etc for looppart in $(ls /dev/$base?*); do run_check $SUDO_HELPER $TOP/mkfs.btrfs -f $looppart - run_check $TOP/btrfs-show-super $looppart + run_check $SUDO_HELPER $TOP/btrfs inspect-internal dump-super $looppart done # cleanup diff --git a/tests/mkfs-tests/007-mix-nodesize-sectorsize/test.sh b/tests/mkfs-tests/007-mix-nodesize-sectorsize/test.sh index d5374cbd..3980414f 100755 --- a/tests/mkfs-tests/007-mix-nodesize-sectorsize/test.sh +++ b/tests/mkfs-tests/007-mix-nodesize-sectorsize/test.sh @@ -3,7 +3,6 @@ source $TOP/tests/common -check_prereq btrfs-show-super check_prereq mkfs.btrfs check_prereq btrfs @@ -13,7 +12,7 @@ prepare_test_dev test_mkfs_single() { run_check $SUDO_HELPER $TOP/mkfs.btrfs -f "$@" $TEST_DEV - run_check $TOP/btrfs-show-super $TEST_DEV + run_check $SUDO_HELPER $TOP/btrfs inspect-internal dump-super $TEST_DEV run_check $SUDO_HELPER $TOP/btrfs check $TEST_DEV } |