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>

6 files changed, 15 insertions, 23 deletions

diff --git a/tests/misc-tests/001-btrfstune-features/test.sh b/tests/misc-tests/001-btrfstune-features/test.sh
index c858d701..bfa7f43e 100755
--- a/tests/misc-tests/001-btrfstune-features/test.sh
+++ b/tests/misc-tests/001-btrfstune-features/test.sh
@@ -3,8 +3,6 @@
 
 source $TOP/tests/common
 
-check_prereq btrfs-debug-tree
-check_prereq btrfs-show-super
 check_prereq mkfs.btrfs
 check_prereq btrfstune
 check_prereq btrfs
@@ -16,7 +14,7 @@ prepare_test_dev
 # parameters:
 # - option for mkfs.btrfs -O, empty for defaults
 # - option for btrfstune
-# - string representing the feature in btrfs-show-super dump
+# - string representing the feature in dump-super output
 test_feature()
 {
 	local mkfsfeatures
@@ -28,12 +26,12 @@ test_feature()
 	sbflag="$3"
 
 	run_check $SUDO_HELPER $TOP/mkfs.btrfs -f $mkfsfeatures $TEST_DEV
-	if run_check_stdout $TOP/btrfs-show-super $TEST_DEV | \
+	if run_check_stdout $TOP/btrfs inspect-internal dump-super $TEST_DEV | \
 			grep -q "$sbflag"; then
 		_fail "FAIL: feature $sbflag must not be set on the base image"
 	fi
 	run_check $TOP/btrfstune $tuneopt $TEST_DEV
-	if ! run_check_stdout $TOP/btrfs-show-super $TEST_DEV | \
+	if ! run_check_stdout $TOP/btrfs inspect-internal dump-super $TEST_DEV | \
 			grep -q "$sbflag"; then
 		_fail "FAIL: feature $sbflag not set"
 	fi
diff --git a/tests/misc-tests/002-uuid-rewrite/test.sh b/tests/misc-tests/002-uuid-rewrite/test.sh
index d84ec6ca..fd100fb3 100755
--- a/tests/misc-tests/002-uuid-rewrite/test.sh
+++ b/tests/misc-tests/002-uuid-rewrite/test.sh
@@ -3,8 +3,6 @@
 
 source $TOP/tests/common
 
-check_prereq btrfs-debug-tree
-check_prereq btrfs-show-super
 check_prereq mkfs.btrfs
 check_prereq btrfstune
 check_prereq btrfs
@@ -15,7 +13,7 @@ get_fs_uuid() {
 	local image
 
 	image="$1"
-	run_check_stdout $TOP/btrfs-show-super "$image" | \
+	run_check_stdout $TOP/btrfs inspect-internal dump-super "$image" | \
 		grep '^fsid' | awk '{print $2}'
 }
 
@@ -29,13 +27,13 @@ test_uuid_random()
 		--uuid $origuuid \
 		--rootdir $TOP/Documentation \
 		$TEST_DEV
-	run_check $TOP/btrfs-show-super "$TEST_DEV"
+	run_check $TOP/btrfs inspect-internal dump-super "$TEST_DEV"
 	currentfsid=$(run_check_stdout $TOP/btrfstune -f -u $TEST_DEV | \
 		grep -i 'current fsid:' | awk '{print $3}')
 	if ! [ $currentfsid = $origuuid ]; then
 		_fail "FAIL: current UUID mismatch"
 	fi
-	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
 }
 
@@ -51,10 +49,10 @@ test_uuid_user()
 		--uuid $origuuid \
 		--rootdir $TOP/Documentation \
 		$TEST_DEV
-	run_check $TOP/btrfs-show-super "$TEST_DEV"
+	run_check $TOP/btrfs inspect-internal dump-super "$TEST_DEV"
 	run_check $TOP/btrfstune -f -U $newuuid \
 		$TEST_DEV
-	# btrfs-show-super is called within get_fs_uuid
+	# btrfs inspect-internal dump-super is called within get_fs_uuid
 	fsid=$(get_fs_uuid $TEST_DEV)
 	if ! [ $fsid = $newuuid ]; then
 		_fail "FAIL: UUID not rewritten"
diff --git a/tests/misc-tests/003-zero-log/test.sh b/tests/misc-tests/003-zero-log/test.sh
index b650930e..e7c5c806 100755
--- a/tests/misc-tests/003-zero-log/test.sh
+++ b/tests/misc-tests/003-zero-log/test.sh
@@ -3,7 +3,6 @@
 
 source $TOP/tests/common
 
-check_prereq btrfs-show-super
 check_prereq mkfs.btrfs
 check_prereq btrfs
 prepare_test_dev
@@ -13,14 +12,14 @@ get_log_root()
 	local image
 
 	image="$1"
-	$TOP/btrfs-show-super "$image" | \
+	$TOP/btrfs inspect-internal dump-super "$image" | \
 		grep '^log_root\>' | awk '{print $2}'
 }
 get_log_root_level() {
 	local image
 
 	image="$1"
-	$TOP/btrfs-show-super "$image" | \
+	$TOP/btrfs inspect-internal dump-super "$image" | \
 		grep '^log_root_level' | awk '{print $2}'
 }
 
@@ -30,7 +29,7 @@ test_zero_log()
 	run_check $SUDO_HELPER $TOP/mkfs.btrfs -f \
 		--rootdir $TOP/Documentation \
 		$TEST_DEV
-	run_check $TOP/btrfs-show-super $TEST_DEV
+	run_check $TOP/btrfs inspect-internal dump-super $TEST_DEV
 	if [ "$1" = 'standalone' ]; then
 		run_check $TOP/btrfs rescue zero-log $TEST_DEV
 	else
@@ -44,7 +43,7 @@ test_zero_log()
 	if [ "$log_root_level" != 0 ]; then
 		_fail "FAIL: log_root_level not reset"
 	fi
-	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
 }
 
diff --git a/tests/misc-tests/006-image-on-missing-device/test.sh b/tests/misc-tests/006-image-on-missing-device/test.sh
index b22a95d7..83a6a056 100755
--- a/tests/misc-tests/006-image-on-missing-device/test.sh
+++ b/tests/misc-tests/006-image-on-missing-device/test.sh
@@ -6,7 +6,6 @@
 
 source $TOP/tests/common
 
-check_prereq btrfs-show-super
 check_prereq btrfs-image
 check_prereq mkfs.btrfs
 check_prereq btrfs
diff --git a/tests/misc-tests/010-convert-delete-ext2-subvol/test.sh b/tests/misc-tests/010-convert-delete-ext2-subvol/test.sh
index 451e453a..7bf7be34 100755
--- a/tests/misc-tests/010-convert-delete-ext2-subvol/test.sh
+++ b/tests/misc-tests/010-convert-delete-ext2-subvol/test.sh
@@ -6,7 +6,6 @@
 source $TOP/tests/common
 
 check_prereq btrfs-convert
-check_prereq btrfs-debug-tree
 check_prereq btrfs
 
 setup_root_helper
@@ -15,11 +14,11 @@ prepare_test_dev
 run_check truncate -s 2G "$TEST_DEV"
 run_check mkfs.ext4 -F "$TEST_DEV"
 run_check $TOP/btrfs-convert "$TEST_DEV"
-run_check $TOP/btrfs-debug-tree "$TEST_DEV"
+run_check $TOP/btrfs inspect-internal dump-tree "$TEST_DEV"
 run_check_mount_test_dev
 run_check $SUDO_HELPER $TOP/btrfs subvolume delete -c "$TEST_MNT/ext2_saved"
 run_check_umount_test_dev
-run_check $TOP/btrfs-debug-tree "$TEST_DEV"
+run_check $TOP/btrfs inspect-internal dump-tree "$TEST_DEV"
 run_check_stdout $TOP/btrfs-convert --rollback "$TEST_DEV" |
 	grep -q 'is it deleted' || _fail "unexpected rollback"
 
diff --git a/tests/misc-tests/011-delete-missing-device/test.sh b/tests/misc-tests/011-delete-missing-device/test.sh
index 26645f10..57e88745 100755
--- a/tests/misc-tests/011-delete-missing-device/test.sh
+++ b/tests/misc-tests/011-delete-missing-device/test.sh
@@ -3,7 +3,6 @@
 
 source $TOP/tests/common
 
-check_prereq btrfs-show-super
 check_prereq mkfs.btrfs
 check_prereq btrfs
 
@@ -39,7 +38,7 @@ cleanup_devices()
 test_do_mkfs()
 {
 	run_check $SUDO_HELPER $TOP/mkfs.btrfs -f $@ ${devs[@]}
-	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 $TOP/btrfs filesystem show
 }