linux-btrfs.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Qu Wenruo <wqu@suse.com>
To: linux-btrfs@vger.kernel.org
Subject: [PATCH 5/5] btrfs-progs: convert-tests: Skip tests if kernel doesn't support subpage sized sector size
Date: Fri,  5 Jul 2019 15:26:51 +0800	[thread overview]
Message-ID: <20190705072651.25150-6-wqu@suse.com> (raw)
In-Reply-To: <20190705072651.25150-1-wqu@suse.com>

Most convert tests needs to mount the converted image, and both reiserfs
and ext* uses 4k block size, on 32K page size system we can't mount them
and will cause test failure.

Skip most of convert tests, except 007-unsupported-block-sizes, which
should fail on all systems.

Signed-off-by: Qu Wenruo <wqu@suse.com>
---
 tests/convert-tests/001-ext2-basic/test.sh                    | 1 +
 tests/convert-tests/002-ext3-basic/test.sh                    | 1 +
 tests/convert-tests/003-ext4-basic/test.sh                    | 1 +
 tests/convert-tests/004-ext2-backup-superblock-ranges/test.sh | 1 +
 tests/convert-tests/005-delete-all-rollback/test.sh           | 1 +
 tests/convert-tests/006-large-hole-extent/test.sh             | 2 ++
 tests/convert-tests/008-readonly-image/test.sh                | 1 +
 tests/convert-tests/009-common-inode-flags/test.sh            | 1 +
 tests/convert-tests/010-reiserfs-basic/test.sh                | 2 ++
 tests/convert-tests/011-reiserfs-delete-all-rollback/test.sh  | 1 +
 tests/convert-tests/012-reiserfs-large-hole-extent/test.sh    | 1 +
 tests/convert-tests/013-reiserfs-common-inode-flags/test.sh   | 1 +
 tests/convert-tests/014-reiserfs-tail-handling/test.sh        | 1 +
 tests/convert-tests/015-no-rollback-after-balance/test.sh     | 1 +
 tests/convert-tests/016-invalid-large-inline-extent/test.sh   | 1 +
 15 files changed, 17 insertions(+)

diff --git a/tests/convert-tests/001-ext2-basic/test.sh b/tests/convert-tests/001-ext2-basic/test.sh
index 74cc74e86fe4..94be68bc6b84 100755
--- a/tests/convert-tests/001-ext2-basic/test.sh
+++ b/tests/convert-tests/001-ext2-basic/test.sh
@@ -4,6 +4,7 @@ source "$TEST_TOP/common"
 source "$TEST_TOP/common.convert"
 
 setup_root_helper
+check_prereq_mount_with_sectorsize 4096
 prepare_test_dev
 check_prereq btrfs-convert
 check_global_prereq mke2fs
diff --git a/tests/convert-tests/002-ext3-basic/test.sh b/tests/convert-tests/002-ext3-basic/test.sh
index f08698976c15..57e83681adb7 100755
--- a/tests/convert-tests/002-ext3-basic/test.sh
+++ b/tests/convert-tests/002-ext3-basic/test.sh
@@ -4,6 +4,7 @@ source "$TEST_TOP/common"
 source "$TEST_TOP/common.convert"
 
 setup_root_helper
+check_prereq_mount_with_sectorsize 4096
 prepare_test_dev
 check_prereq btrfs-convert
 check_global_prereq mke2fs
diff --git a/tests/convert-tests/003-ext4-basic/test.sh b/tests/convert-tests/003-ext4-basic/test.sh
index c5caf67c9300..d20d854fc387 100755
--- a/tests/convert-tests/003-ext4-basic/test.sh
+++ b/tests/convert-tests/003-ext4-basic/test.sh
@@ -4,6 +4,7 @@ source "$TEST_TOP/common"
 source "$TEST_TOP/common.convert"
 
 setup_root_helper
+check_prereq_mount_with_sectorsize 4096
 prepare_test_dev
 check_prereq btrfs-convert
 check_global_prereq mke2fs
diff --git a/tests/convert-tests/004-ext2-backup-superblock-ranges/test.sh b/tests/convert-tests/004-ext2-backup-superblock-ranges/test.sh
index 857e240837dc..620374e857d1 100755
--- a/tests/convert-tests/004-ext2-backup-superblock-ranges/test.sh
+++ b/tests/convert-tests/004-ext2-backup-superblock-ranges/test.sh
@@ -14,6 +14,7 @@ source "$TEST_TOP/common"
 
 check_prereq btrfs-convert
 check_prereq btrfs
+check_prereq_mount_with_sectorsize 4096
 check_global_prereq e2fsck
 check_global_prereq xzcat
 
diff --git a/tests/convert-tests/005-delete-all-rollback/test.sh b/tests/convert-tests/005-delete-all-rollback/test.sh
index a5f9d594bfd5..431c642b221d 100755
--- a/tests/convert-tests/005-delete-all-rollback/test.sh
+++ b/tests/convert-tests/005-delete-all-rollback/test.sh
@@ -8,6 +8,7 @@ source "$TEST_TOP/common.convert"
 setup_root_helper
 prepare_test_dev
 check_prereq btrfs-convert
+check_prereq_mount_with_sectorsize 4096
 check_global_prereq mke2fs
 
 # simple wrapper for a convert test
diff --git a/tests/convert-tests/006-large-hole-extent/test.sh b/tests/convert-tests/006-large-hole-extent/test.sh
index a37fcbdc99a6..7a974d74e47f 100755
--- a/tests/convert-tests/006-large-hole-extent/test.sh
+++ b/tests/convert-tests/006-large-hole-extent/test.sh
@@ -11,6 +11,8 @@ source "$TEST_TOP/common.convert"
 setup_root_helper
 prepare_test_dev
 check_prereq btrfs-convert
+check_prereq_mount_with_sectorsize 4096
+prepare_test_dev
 check_global_prereq mke2fs
 
 default_mke2fs="mke2fs -t ext4 -b 4096"
diff --git a/tests/convert-tests/008-readonly-image/test.sh b/tests/convert-tests/008-readonly-image/test.sh
index 1a65ea6b3a19..08d87b0d4433 100755
--- a/tests/convert-tests/008-readonly-image/test.sh
+++ b/tests/convert-tests/008-readonly-image/test.sh
@@ -7,6 +7,7 @@ source "$TEST_TOP/common.convert"
 setup_root_helper
 prepare_test_dev
 check_prereq btrfs-convert
+check_prereq_mount_with_sectorsize 4096
 check_global_prereq mke2fs
 
 default_mke2fs="mke2fs -t ext4 -b 4096"
diff --git a/tests/convert-tests/009-common-inode-flags/test.sh b/tests/convert-tests/009-common-inode-flags/test.sh
index 428213bfcb15..22702af338f7 100755
--- a/tests/convert-tests/009-common-inode-flags/test.sh
+++ b/tests/convert-tests/009-common-inode-flags/test.sh
@@ -7,6 +7,7 @@ source "$TEST_TOP/common.convert"
 setup_root_helper
 prepare_test_dev
 check_prereq btrfs-convert
+check_prereq_mount_with_sectorsize 4096
 check_global_prereq mke2fs
 check_global_prereq lsattr
 check_global_prereq chattr
diff --git a/tests/convert-tests/010-reiserfs-basic/test.sh b/tests/convert-tests/010-reiserfs-basic/test.sh
index 73652991cc6b..7f14956fd853 100755
--- a/tests/convert-tests/010-reiserfs-basic/test.sh
+++ b/tests/convert-tests/010-reiserfs-basic/test.sh
@@ -10,6 +10,8 @@ fi
 setup_root_helper
 prepare_test_dev
 check_prereq btrfs-convert
+check_prereq_mount_with_sectorsize 4096
+prepare_test_dev
 check_global_prereq mkreiserfs
 
 for feature in '' 'extref' 'skinny-metadata' 'no-holes'; do
diff --git a/tests/convert-tests/011-reiserfs-delete-all-rollback/test.sh b/tests/convert-tests/011-reiserfs-delete-all-rollback/test.sh
index 28877e142483..36b3b3888ddb 100755
--- a/tests/convert-tests/011-reiserfs-delete-all-rollback/test.sh
+++ b/tests/convert-tests/011-reiserfs-delete-all-rollback/test.sh
@@ -11,6 +11,7 @@ fi
 setup_root_helper
 prepare_test_dev
 check_prereq btrfs-convert
+check_prereq_mount_with_sectorsize 4096
 check_global_prereq mkreiserfs
 
 # simple wrapper for a convert test
diff --git a/tests/convert-tests/012-reiserfs-large-hole-extent/test.sh b/tests/convert-tests/012-reiserfs-large-hole-extent/test.sh
index d492779a386b..55d17cd54bf2 100755
--- a/tests/convert-tests/012-reiserfs-large-hole-extent/test.sh
+++ b/tests/convert-tests/012-reiserfs-large-hole-extent/test.sh
@@ -15,6 +15,7 @@ fi
 setup_root_helper
 prepare_test_dev
 check_prereq btrfs-convert
+check_prereq_mount_with_sectorsize 4096
 check_global_prereq mkreiserfs
 
 default_mkfs="mkreiserfs -b 4096"
diff --git a/tests/convert-tests/013-reiserfs-common-inode-flags/test.sh b/tests/convert-tests/013-reiserfs-common-inode-flags/test.sh
index 521e8bd4fba4..cf83b29b4d82 100755
--- a/tests/convert-tests/013-reiserfs-common-inode-flags/test.sh
+++ b/tests/convert-tests/013-reiserfs-common-inode-flags/test.sh
@@ -11,6 +11,7 @@ fi
 setup_root_helper
 prepare_test_dev
 check_prereq btrfs-convert
+check_prereq_mount_with_sectorsize 4096
 check_global_prereq mkreiserfs
 check_global_prereq chattr
 check_global_prereq lsattr
diff --git a/tests/convert-tests/014-reiserfs-tail-handling/test.sh b/tests/convert-tests/014-reiserfs-tail-handling/test.sh
index 3be2ed5b6299..a2757f4674d6 100755
--- a/tests/convert-tests/014-reiserfs-tail-handling/test.sh
+++ b/tests/convert-tests/014-reiserfs-tail-handling/test.sh
@@ -16,6 +16,7 @@ fi
 setup_root_helper
 prepare_test_dev
 check_prereq btrfs-convert
+check_prereq_mount_with_sectorsize 4096
 check_global_prereq md5sum
 check_global_prereq mkreiserfs
 
diff --git a/tests/convert-tests/015-no-rollback-after-balance/test.sh b/tests/convert-tests/015-no-rollback-after-balance/test.sh
index 2f6407f3a5f7..155887879aa2 100755
--- a/tests/convert-tests/015-no-rollback-after-balance/test.sh
+++ b/tests/convert-tests/015-no-rollback-after-balance/test.sh
@@ -8,6 +8,7 @@ source "$TEST_TOP/common.convert"
 setup_root_helper
 prepare_test_dev
 check_prereq btrfs-convert
+check_prereq_mount_with_sectorsize 4096
 check_global_prereq mke2fs
 
 # convert_test_prep_fs() will create large enough file inside the test device,
diff --git a/tests/convert-tests/016-invalid-large-inline-extent/test.sh b/tests/convert-tests/016-invalid-large-inline-extent/test.sh
index f37c7c09d2e7..0308dcea13b3 100755
--- a/tests/convert-tests/016-invalid-large-inline-extent/test.sh
+++ b/tests/convert-tests/016-invalid-large-inline-extent/test.sh
@@ -8,6 +8,7 @@ source "$TEST_TOP/common.convert"
 setup_root_helper
 prepare_test_dev
 check_prereq btrfs-convert
+check_prereq_mount_with_sectorsize 4096
 check_global_prereq mke2fs
 
 convert_test_prep_fs ext4 mke2fs -t ext4 -b 4096
-- 
2.22.0


  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 ` [PATCH 3/5] btrfs-progs: mkfs-tests: Skip 010-minimal-size if we can't mount with 4k " Qu Wenruo
2019-07-22 17:15   ` 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 ` Qu Wenruo [this message]
2019-07-22 17:39   ` [PATCH 5/5] btrfs-progs: convert-tests: Skip tests if kernel doesn't support subpage sized sector size 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-6-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;
as well as URLs for NNTP newsgroup(s).