From c12a6e4dca5e5b388124b81c3ea02e2835822924 Mon Sep 17 00:00:00 2001
From: David Sterba <dsterba@suse.com>
Date: Mon, 27 Nov 2017 23:58:23 +0100
Subject: btrfs-progs: tests: fix typos in test names

Signed-off-by: David Sterba <dsterba@suse.com>
---
 .../019-receive-clones-on-mounted-subvol/test.sh   | 127 +++++++++++++++++++++
 .../019-receive-clones-on-munted-subvol/test.sh    | 127 ---------------------
 .../008-secorsize-nodesize-combination/test.sh     |  50 --------
 .../008-sectorsize-nodesize-combination/test.sh    |  50 ++++++++
 4 files changed, 177 insertions(+), 177 deletions(-)
 create mode 100755 tests/misc-tests/019-receive-clones-on-mounted-subvol/test.sh
 delete mode 100755 tests/misc-tests/019-receive-clones-on-munted-subvol/test.sh
 delete mode 100755 tests/mkfs-tests/008-secorsize-nodesize-combination/test.sh
 create mode 100755 tests/mkfs-tests/008-sectorsize-nodesize-combination/test.sh

diff --git a/tests/misc-tests/019-receive-clones-on-mounted-subvol/test.sh b/tests/misc-tests/019-receive-clones-on-mounted-subvol/test.sh
new file mode 100755
index 00000000..182b0cf9
--- /dev/null
+++ b/tests/misc-tests/019-receive-clones-on-mounted-subvol/test.sh
@@ -0,0 +1,127 @@
+#! /bin/bash
+#
+# Test that an incremental send operation works when in both snapshots there are
+# two directory inodes that have the same number but different generations and
+# have an entry with the same name that corresponds to different inodes in each
+# snapshot.
+
+source $TOP/tests/common
+
+check_prereq mkfs.btrfs
+check_prereq btrfs
+check_prereq fssum
+
+setup_root_helper
+prepare_test_dev
+
+FSSUM_PROG="$TOP/fssum"
+srcdir=./send-test-dir
+rm -rf "$srcdir"
+mkdir -p "$srcdir"
+run_check chmod a+rw "$srcdir"
+
+run_check "$TOP/mkfs.btrfs" -f "$TEST_DEV"
+run_check_mount_test_dev
+
+BLOCK_SIZE=$(stat -f -c %S "$TEST_MNT")
+
+run_check $SUDO_HELPER "$TOP/btrfs" subvolume create "$TEST_MNT/foo"
+run_check $SUDO_HELPER "$TOP/btrfs" subvolume create "$TEST_MNT/bar"
+run_check $SUDO_HELPER "$TOP/btrfs" subvolume create "$TEST_MNT/baz"
+run_check $SUDO_HELPER "$TOP/btrfs" subvolume create "$TEST_MNT/snap"
+
+tr '\000' 'A' < /dev/null |
+	run_check $SUDO_HELPER dd of=$TEST_MNT/foo/file_a bs=$BLOCK_SIZE count=32
+tr '\000' 'B' < /dev/null |
+	run_check $SUDO_HELPER dd of=$TEST_MNT/bar/file_b bs=$BLOCK_SIZE count=32
+
+run_check $SUDO_HELPER cp --reflink=always "$TEST_MNT/foo/file_a" "$TEST_MNT/baz/file_a"
+run_check $SUDO_HELPER cp --reflink=always "$TEST_MNT/bar/file_b" "$TEST_MNT/baz/file_b"
+
+# Filesystem looks like:
+#
+# .
+# |--- foo/
+# |       |--- file_a
+# |--- bar/
+# |       |--- file_b
+# |--- baz/
+# |       |--- file_a                   (clone of "foo/file_a")
+# |       |--- file_b                   (clone of "bar/file_b")
+# |--- snap/
+#
+
+# create snapshots and send streams
+
+run_check $SUDO_HELPER "$TOP/btrfs" subvolume snapshot -r "$TEST_MNT/foo" "$TEST_MNT/snap/foo.0"
+run_check $SUDO_HELPER "$TOP/btrfs" send -f "$srcdir/foo.0.snap" "$TEST_MNT/snap/foo.0"
+
+run_check $SUDO_HELPER "$TOP/btrfs" subvolume snapshot -r "$TEST_MNT/bar" "$TEST_MNT/snap/bar.0"
+run_check $SUDO_HELPER "$TOP/btrfs" send -f "$srcdir/bar.0.snap" "$TEST_MNT/snap/bar.0"
+
+run_check $SUDO_HELPER cp --reflink=always "$TEST_MNT/foo/file_a" "$TEST_MNT/foo/file_a.clone"
+run_check $SUDO_HELPER rm -f -- "$TEST_MNT/foo/file_a"
+
+run_check $SUDO_HELPER "$TOP/btrfs" subvolume snapshot -r "$TEST_MNT/foo" \
+	"$TEST_MNT/snap/foo.1"
+run_check $SUDO_HELPER "$TOP/btrfs" send -p "$TEST_MNT/snap/foo.0" -f "$srcdir/foo.1.snap" \
+	"$TEST_MNT/snap/foo.1"
+
+run_check $SUDO_HELPER "$TOP/btrfs" subvolume snapshot -r "$TEST_MNT/baz" \
+	"$TEST_MNT/snap/baz.0"
+run_check $SUDO_HELPER "$TOP/btrfs" send -p "$TEST_MNT/snap/foo.1" \
+	-c "$TEST_MNT/snap/bar.0" -f "$srcdir/baz.0.snap" \
+	"$TEST_MNT/snap/baz.0"
+
+# Filesystem looks like:
+#
+# .
+# |--- foo/
+# |       |--- file_a.clone             (clone of "foo/file_a")
+# |--- bar/
+# |       |--- file_b
+# |--- baz/
+# |       |--- file_a                   (clone of "foo/file_a")
+# |       |--- file_b                   (clone of "bar/file_b")
+# |--- snap/
+#          |--- bar.0/                  (snapshot of "bar")
+#          |         |--- file_b
+#          |--- foo.0/                  (snapshot of "foo")
+#          |         |--- file_a
+#          |--- foo.1/                  (snapshot of "foo")
+#          |         |--- file_a.clone
+#          |--- baz.0/                  (snapshot of "baz")
+#          |         |--- file_a
+#          |         |--- file_b
+
+run_check $FSSUM_PROG -A -f -w "$srcdir/foo.0.fssum" "$TEST_MNT/snap/foo.0"
+run_check $FSSUM_PROG -A -f -w "$srcdir/foo.1.fssum" "$TEST_MNT/snap/foo.1"
+run_check $FSSUM_PROG -A -f -w "$srcdir/bar.0.fssum" "$TEST_MNT/snap/bar.0"
+run_check $FSSUM_PROG -A -f -w "$srcdir/baz.0.fssum" "$TEST_MNT/snap/baz.0"
+
+run_check_umount_test_dev
+run_check "$TOP/mkfs.btrfs" -f "$TEST_DEV"
+run_check_mount_test_dev
+run_check $SUDO_HELPER "$TOP/btrfs" subvolume create "$TEST_MNT/dest"
+run_check_umount_test_dev
+run_check_mount_test_dev -o subvol=/dest
+
+run_check $SUDO_HELPER "$TOP/btrfs" receive -f "$srcdir/foo.0.snap" "$TEST_MNT"
+run_check $SUDO_HELPER "$TOP/btrfs" receive -f "$srcdir/bar.0.snap" "$TEST_MNT"
+
+# if "dest/" is not correctly stripped from the beginning of the path to
+# "foo.0" in the target fs, we would get an error here because the clone source
+# "foo.0/file_a" for "foo.1/file_a.clone" can't be found.
+run_check $SUDO_HELPER "$TOP/btrfs" receive -f "$srcdir/foo.1.snap" "$TEST_MNT"
+
+# same here, but with send -c instead of -p
+run_check $SUDO_HELPER "$TOP/btrfs" receive -f "$srcdir/baz.0.snap" "$TEST_MNT"
+
+run_check $FSSUM_PROG -r "$srcdir/foo.0.fssum" "$TEST_MNT/foo.0"
+run_check $FSSUM_PROG -r "$srcdir/foo.1.fssum" "$TEST_MNT/foo.1"
+run_check $FSSUM_PROG -r "$srcdir/bar.0.fssum" "$TEST_MNT/bar.0"
+run_check $FSSUM_PROG -r "$srcdir/baz.0.fssum" "$TEST_MNT/baz.0"
+
+run_check_umount_test_dev
+
+rm -rf -- "$srcdir"
diff --git a/tests/misc-tests/019-receive-clones-on-munted-subvol/test.sh b/tests/misc-tests/019-receive-clones-on-munted-subvol/test.sh
deleted file mode 100755
index 182b0cf9..00000000
--- a/tests/misc-tests/019-receive-clones-on-munted-subvol/test.sh
+++ /dev/null
@@ -1,127 +0,0 @@
-#! /bin/bash
-#
-# Test that an incremental send operation works when in both snapshots there are
-# two directory inodes that have the same number but different generations and
-# have an entry with the same name that corresponds to different inodes in each
-# snapshot.
-
-source $TOP/tests/common
-
-check_prereq mkfs.btrfs
-check_prereq btrfs
-check_prereq fssum
-
-setup_root_helper
-prepare_test_dev
-
-FSSUM_PROG="$TOP/fssum"
-srcdir=./send-test-dir
-rm -rf "$srcdir"
-mkdir -p "$srcdir"
-run_check chmod a+rw "$srcdir"
-
-run_check "$TOP/mkfs.btrfs" -f "$TEST_DEV"
-run_check_mount_test_dev
-
-BLOCK_SIZE=$(stat -f -c %S "$TEST_MNT")
-
-run_check $SUDO_HELPER "$TOP/btrfs" subvolume create "$TEST_MNT/foo"
-run_check $SUDO_HELPER "$TOP/btrfs" subvolume create "$TEST_MNT/bar"
-run_check $SUDO_HELPER "$TOP/btrfs" subvolume create "$TEST_MNT/baz"
-run_check $SUDO_HELPER "$TOP/btrfs" subvolume create "$TEST_MNT/snap"
-
-tr '\000' 'A' < /dev/null |
-	run_check $SUDO_HELPER dd of=$TEST_MNT/foo/file_a bs=$BLOCK_SIZE count=32
-tr '\000' 'B' < /dev/null |
-	run_check $SUDO_HELPER dd of=$TEST_MNT/bar/file_b bs=$BLOCK_SIZE count=32
-
-run_check $SUDO_HELPER cp --reflink=always "$TEST_MNT/foo/file_a" "$TEST_MNT/baz/file_a"
-run_check $SUDO_HELPER cp --reflink=always "$TEST_MNT/bar/file_b" "$TEST_MNT/baz/file_b"
-
-# Filesystem looks like:
-#
-# .
-# |--- foo/
-# |       |--- file_a
-# |--- bar/
-# |       |--- file_b
-# |--- baz/
-# |       |--- file_a                   (clone of "foo/file_a")
-# |       |--- file_b                   (clone of "bar/file_b")
-# |--- snap/
-#
-
-# create snapshots and send streams
-
-run_check $SUDO_HELPER "$TOP/btrfs" subvolume snapshot -r "$TEST_MNT/foo" "$TEST_MNT/snap/foo.0"
-run_check $SUDO_HELPER "$TOP/btrfs" send -f "$srcdir/foo.0.snap" "$TEST_MNT/snap/foo.0"
-
-run_check $SUDO_HELPER "$TOP/btrfs" subvolume snapshot -r "$TEST_MNT/bar" "$TEST_MNT/snap/bar.0"
-run_check $SUDO_HELPER "$TOP/btrfs" send -f "$srcdir/bar.0.snap" "$TEST_MNT/snap/bar.0"
-
-run_check $SUDO_HELPER cp --reflink=always "$TEST_MNT/foo/file_a" "$TEST_MNT/foo/file_a.clone"
-run_check $SUDO_HELPER rm -f -- "$TEST_MNT/foo/file_a"
-
-run_check $SUDO_HELPER "$TOP/btrfs" subvolume snapshot -r "$TEST_MNT/foo" \
-	"$TEST_MNT/snap/foo.1"
-run_check $SUDO_HELPER "$TOP/btrfs" send -p "$TEST_MNT/snap/foo.0" -f "$srcdir/foo.1.snap" \
-	"$TEST_MNT/snap/foo.1"
-
-run_check $SUDO_HELPER "$TOP/btrfs" subvolume snapshot -r "$TEST_MNT/baz" \
-	"$TEST_MNT/snap/baz.0"
-run_check $SUDO_HELPER "$TOP/btrfs" send -p "$TEST_MNT/snap/foo.1" \
-	-c "$TEST_MNT/snap/bar.0" -f "$srcdir/baz.0.snap" \
-	"$TEST_MNT/snap/baz.0"
-
-# Filesystem looks like:
-#
-# .
-# |--- foo/
-# |       |--- file_a.clone             (clone of "foo/file_a")
-# |--- bar/
-# |       |--- file_b
-# |--- baz/
-# |       |--- file_a                   (clone of "foo/file_a")
-# |       |--- file_b                   (clone of "bar/file_b")
-# |--- snap/
-#          |--- bar.0/                  (snapshot of "bar")
-#          |         |--- file_b
-#          |--- foo.0/                  (snapshot of "foo")
-#          |         |--- file_a
-#          |--- foo.1/                  (snapshot of "foo")
-#          |         |--- file_a.clone
-#          |--- baz.0/                  (snapshot of "baz")
-#          |         |--- file_a
-#          |         |--- file_b
-
-run_check $FSSUM_PROG -A -f -w "$srcdir/foo.0.fssum" "$TEST_MNT/snap/foo.0"
-run_check $FSSUM_PROG -A -f -w "$srcdir/foo.1.fssum" "$TEST_MNT/snap/foo.1"
-run_check $FSSUM_PROG -A -f -w "$srcdir/bar.0.fssum" "$TEST_MNT/snap/bar.0"
-run_check $FSSUM_PROG -A -f -w "$srcdir/baz.0.fssum" "$TEST_MNT/snap/baz.0"
-
-run_check_umount_test_dev
-run_check "$TOP/mkfs.btrfs" -f "$TEST_DEV"
-run_check_mount_test_dev
-run_check $SUDO_HELPER "$TOP/btrfs" subvolume create "$TEST_MNT/dest"
-run_check_umount_test_dev
-run_check_mount_test_dev -o subvol=/dest
-
-run_check $SUDO_HELPER "$TOP/btrfs" receive -f "$srcdir/foo.0.snap" "$TEST_MNT"
-run_check $SUDO_HELPER "$TOP/btrfs" receive -f "$srcdir/bar.0.snap" "$TEST_MNT"
-
-# if "dest/" is not correctly stripped from the beginning of the path to
-# "foo.0" in the target fs, we would get an error here because the clone source
-# "foo.0/file_a" for "foo.1/file_a.clone" can't be found.
-run_check $SUDO_HELPER "$TOP/btrfs" receive -f "$srcdir/foo.1.snap" "$TEST_MNT"
-
-# same here, but with send -c instead of -p
-run_check $SUDO_HELPER "$TOP/btrfs" receive -f "$srcdir/baz.0.snap" "$TEST_MNT"
-
-run_check $FSSUM_PROG -r "$srcdir/foo.0.fssum" "$TEST_MNT/foo.0"
-run_check $FSSUM_PROG -r "$srcdir/foo.1.fssum" "$TEST_MNT/foo.1"
-run_check $FSSUM_PROG -r "$srcdir/bar.0.fssum" "$TEST_MNT/bar.0"
-run_check $FSSUM_PROG -r "$srcdir/baz.0.fssum" "$TEST_MNT/baz.0"
-
-run_check_umount_test_dev
-
-rm -rf -- "$srcdir"
diff --git a/tests/mkfs-tests/008-secorsize-nodesize-combination/test.sh b/tests/mkfs-tests/008-secorsize-nodesize-combination/test.sh
deleted file mode 100755
index 955cd2b1..00000000
--- a/tests/mkfs-tests/008-secorsize-nodesize-combination/test.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/bash
-# test various sectorsize and node size combinations
-# including valid and invalid ones
-# only do mkfs and fsck check, no mounting as
-# sub/multi-pagesize is not supported yet
-
-source $TOP/tests/common
-
-check_prereq mkfs.btrfs
-check_prereq btrfs
-
-prepare_test_dev
-
-# disable mixed bg to avoid sectorsize == nodesize check
-features="^mixed-bg"
-
-# caller need to check whether the combination is valid
-do_test()
-{
-	sectorsize=$1
-	nodesize=$2
-	run_mayfail $TOP/mkfs.btrfs -f -O $features -n $nodesize -s $sectorsize \
-		$TEST_DEV
-	ret=$?
-	if [ $ret == 0 ]; then
-		run_check $TOP/btrfs check $TEST_DEV
-	fi
-	return $ret
-}
-
-# Invalid: Unaligned sectorsize and nodesize
-do_test 8191 8191 && _fail
-
-# Invalid: Aligned sectorsize with unaligned nodesize
-do_test 4k 16385 && _fail
-
-# Invalid: Unaligned sectorsize with aligned nodesize
-do_test 8191 16k && _fail
-
-# Valid: Aligned sectorsize and nodesize
-do_test 4k 16k || _fail
-
-# Invalid: Sectorsize larger than nodesize
-do_test 8k 4k && _fail
-
-# Invalid: too large nodesize
-do_test 16k 128k && _fail
-
-# Valid: large sectorsize
-do_test 64k 64k || _fail
diff --git a/tests/mkfs-tests/008-sectorsize-nodesize-combination/test.sh b/tests/mkfs-tests/008-sectorsize-nodesize-combination/test.sh
new file mode 100755
index 00000000..955cd2b1
--- /dev/null
+++ b/tests/mkfs-tests/008-sectorsize-nodesize-combination/test.sh
@@ -0,0 +1,50 @@
+#!/bin/bash
+# test various sectorsize and node size combinations
+# including valid and invalid ones
+# only do mkfs and fsck check, no mounting as
+# sub/multi-pagesize is not supported yet
+
+source $TOP/tests/common
+
+check_prereq mkfs.btrfs
+check_prereq btrfs
+
+prepare_test_dev
+
+# disable mixed bg to avoid sectorsize == nodesize check
+features="^mixed-bg"
+
+# caller need to check whether the combination is valid
+do_test()
+{
+	sectorsize=$1
+	nodesize=$2
+	run_mayfail $TOP/mkfs.btrfs -f -O $features -n $nodesize -s $sectorsize \
+		$TEST_DEV
+	ret=$?
+	if [ $ret == 0 ]; then
+		run_check $TOP/btrfs check $TEST_DEV
+	fi
+	return $ret
+}
+
+# Invalid: Unaligned sectorsize and nodesize
+do_test 8191 8191 && _fail
+
+# Invalid: Aligned sectorsize with unaligned nodesize
+do_test 4k 16385 && _fail
+
+# Invalid: Unaligned sectorsize with aligned nodesize
+do_test 8191 16k && _fail
+
+# Valid: Aligned sectorsize and nodesize
+do_test 4k 16k || _fail
+
+# Invalid: Sectorsize larger than nodesize
+do_test 8k 4k && _fail
+
+# Invalid: too large nodesize
+do_test 16k 128k && _fail
+
+# Valid: large sectorsize
+do_test 64k 64k || _fail
-- 
cgit v1.2.3