From: Qu Wenruo <wqu@suse.com>
To: linux-btrfs@vger.kernel.org
Subject: [PATCH 3/5] btrfs-progs: mkfs-tests: Skip 010-minimal-size if we can't mount with 4k sector size
Date: Fri, 5 Jul 2019 15:26:49 +0800 [thread overview]
Message-ID: <20190705072651.25150-4-wqu@suse.com> (raw)
In-Reply-To: <20190705072651.25150-1-wqu@suse.com>
[BUG]
Test case 010-minimal-size fails on aarch64 with 64K page size:
[TEST/mkfs] 010-minimal-size
failed: /home/adam/btrfs-progs/mkfs.btrfs -f -n 4k -m single -d single /home/adam/btrfs-progs/tests//test.img
test failed for case 010-minimal-size
make: *** [Makefile:361: test-mkfs] Error 1
[CAUSE]
Mkfs.btrfs defaults to page size as sector size. However this test uses
4k, 16k, 32K and 64K as node size. 4K node size will conflict with 64K
sector size.
[FIX]
- Specify sector size 4K manually
So at least no conflict at mkfs time.
- Skip the test case if kernel can't mount with 4k sector size
So once we add such support, the test can be automatically re-enabled.
Signed-off-by: Qu Wenruo <wqu@suse.com>
---
tests/mkfs-tests/010-minimal-size/test.sh | 41 ++++++++++++-----------
1 file changed, 21 insertions(+), 20 deletions(-)
diff --git a/tests/mkfs-tests/010-minimal-size/test.sh b/tests/mkfs-tests/010-minimal-size/test.sh
index 8480e4c5ae23..b49fad63e519 100755
--- a/tests/mkfs-tests/010-minimal-size/test.sh
+++ b/tests/mkfs-tests/010-minimal-size/test.sh
@@ -5,6 +5,7 @@ source "$TEST_TOP/common"
check_prereq mkfs.btrfs
check_prereq btrfs
+check_prereq_mount_with_sectorsize 4096
setup_root_helper
@@ -24,20 +25,20 @@ do_test()
run_check_umount_test_dev
}
-do_test -n 4k -m single -d single
-do_test -n 4k -m single -d dup
-do_test -n 4k -m dup -d single
-do_test -n 4k -m dup -d dup
+do_test -s 4k -n 4k -m single -d single
+do_test -s 4k -n 4k -m single -d dup
+do_test -s 4k -n 4k -m dup -d single
+do_test -s 4k -n 4k -m dup -d dup
-do_test -n 8k -m single -d single
-do_test -n 8k -m single -d dup
-do_test -n 8k -m dup -d single
-do_test -n 8k -m dup -d dup
+do_test -s 4k -n 8k -m single -d single
+do_test -s 4k -n 8k -m single -d dup
+do_test -s 4k -n 8k -m dup -d single
+do_test -s 4k -n 8k -m dup -d dup
-do_test -n 16k -m single -d single
-do_test -n 16k -m single -d dup
-do_test -n 16k -m dup -d single
-do_test -n 16k -m dup -d dup
+do_test -s 4k -n 16k -m single -d single
+do_test -s 4k -n 16k -m single -d dup
+do_test -s 4k -n 16k -m dup -d single
+do_test -s 4k -n 16k -m dup -d dup
# Temporary: disable the following tests as they fail inside travis but run
# fine otherwise. This is probably caused by kernel version, 4.4 fails and 4.14
@@ -52,12 +53,12 @@ if [ "$TRAVIS" = true ]; then
exit 0
fi
-do_test -n 32k -m single -d single
-do_test -n 32k -m single -d dup
-do_test -n 32k -m dup -d single
-do_test -n 32k -m dup -d dup
+do_test -s 4k -n 32k -m single -d single
+do_test -s 4k -n 32k -m single -d dup
+do_test -s 4k -n 32k -m dup -d single
+do_test -s 4k -n 32k -m dup -d dup
-do_test -n 64k -m single -d single
-do_test -n 64k -m single -d dup
-do_test -n 64k -m dup -d single
-do_test -n 64k -m dup -d dup
+do_test -s 4k -n 64k -m single -d single
+do_test -s 4k -n 64k -m single -d dup
+do_test -s 4k -n 64k -m dup -d single
+do_test -s 4k -n 64k -m dup -d dup
--
2.22.0
next prev parent reply other threads:[~2019-07-05 7:27 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-05 7:26 [PATCH 0/5] btrfs-progs: tests: Make 64K page size system happier Qu Wenruo
2019-07-05 7:26 ` [PATCH 1/5] btrfs-progs: mkfs: Apply the sectorsize user specified on 64k page size system Qu Wenruo
2019-07-05 7:45 ` Nikolay Borisov
2019-07-05 8:38 ` Qu Wenruo
2019-07-05 7:26 ` [PATCH 2/5] btrfs-progs: fsck-tests: Check if current kernel can mount fs with specified sector size Qu Wenruo
2019-07-22 17:07 ` David Sterba
2019-07-23 1:05 ` Qu Wenruo
2019-07-05 7:26 ` Qu Wenruo [this message]
2019-07-22 17:15 ` [PATCH 3/5] btrfs-progs: mkfs-tests: Skip 010-minimal-size if we can't mount with 4k " David Sterba
2019-07-23 1:08 ` Qu Wenruo
2019-07-05 7:26 ` [PATCH 4/5] btrfs-progs: misc-tests: Make test cases work or skipped on 64K page size system Qu Wenruo
2019-07-05 7:26 ` [PATCH 5/5] btrfs-progs: convert-tests: Skip tests if kernel doesn't support subpage sized sector size Qu Wenruo
2019-07-22 17:39 ` David Sterba
2019-07-22 16:49 ` [PATCH 0/5] btrfs-progs: tests: Make 64K page size system happier David Sterba
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190705072651.25150-4-wqu@suse.com \
--to=wqu@suse.com \
--cc=linux-btrfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox