summaryrefslogtreecommitdiff
path: root/tests/mkfs-tests
diff options
context:
space:
mode:
authorDavid Sterba <dsterba@suse.com>2016-10-26 16:41:32 +0200
committerDavid Sterba <dsterba@suse.com>2016-11-09 13:13:37 +0100
commitc8d1c4c7920efea969fedfd6d7b0669832161d22 (patch)
treec57ce99d34a5349b2c3e55a214e29623b71281fe /tests/mkfs-tests
parent40de2f62793ad54a91755edb301f2609121137e4 (diff)
btrfs-progs: tests: switch to dump- commands from inspect
The dump-super and debug-tree commands are replacements for the standalone tools. Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'tests/mkfs-tests')
-rwxr-xr-xtests/mkfs-tests/001-basic-profiles/test.sh3
-rwxr-xr-xtests/mkfs-tests/005-long-device-name-for-ssd/test.sh3
-rwxr-xr-xtests/mkfs-tests/006-partitioned-loopdev/test.sh3
-rwxr-xr-xtests/mkfs-tests/007-mix-nodesize-sectorsize/test.sh3
4 files changed, 4 insertions, 8 deletions
diff --git a/tests/mkfs-tests/001-basic-profiles/test.sh b/tests/mkfs-tests/001-basic-profiles/test.sh
index a6769214..e893887f 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
@@ -38,7 +37,7 @@ cleanup_devices()
test_get_info()
{
- run_check $TOP/btrfs-show-super $dev1
+ run_check $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..20387b83 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 $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..e40dc675 100755
--- a/tests/mkfs-tests/006-partitioned-loopdev/test.sh
+++ b/tests/mkfs-tests/006-partitioned-loopdev/test.sh
@@ -4,7 +4,6 @@
source $TOP/tests/common
check_prereq mkfs.btrfs
-check_prereq btrfs-show-super
setup_root_helper
@@ -19,7 +18,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 $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..29d9be14 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 $TOP/btrfs inspect-internal dump-super $TEST_DEV
run_check $SUDO_HELPER $TOP/btrfs check $TEST_DEV
}