Skip to content

Improve xfstest #3010

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PraveenPenguin merged 3 commits into from
Jun 30, 2025
Merged

Improve xfstest #3010

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a907e13
btrfs: drop explicit -n option to use default nodesize
disgoel May 29, 2025
fbb6540
dax: change test group from quick to auto
disgoel Jun 11, 2025
df3d57e
xfstest: remove xmlto and asciidoc package
disgoel Jun 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions fs/xfstests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,8 +159,8 @@ def __setUp_packages(self):
'libattr1-dev', 'libacl1-dev', 'libgdbm-dev',
'uuid-runtime', 'libaio-dev', 'fio', 'dbench',
'gettext', 'libinih-dev', 'liburcu-dev', 'libblkid-dev',
'liblzo2-dev', 'zlib1g-dev', 'e2fslibs-dev', 'asciidoc',
'xmlto', 'libzstd-dev', 'libudev-dev', 'bc', 'dump', 'acl',
'liblzo2-dev', 'zlib1g-dev', 'e2fslibs-dev',
'libzstd-dev', 'libudev-dev', 'bc', 'dump', 'acl',
'lvm2', 'sed'])
if self.detected_distro.version in ['14']:
packages.extend(['libtool'])
Expand All @@ -178,8 +178,8 @@ def __setUp_packages(self):
'xfsdump', 'psmisc', 'sed', 'libacl-devel',
'libattr-devel', 'libaio-devel', 'libuuid-devel',
'libblkid-devel', 'lzo-devel', 'zlib-devel',
'e2fsprogs-devel', 'asciidoc', 'xmlto',
'libzstd-devel', 'systemd-devel', 'meson',
'e2fsprogs-devel', 'libzstd-devel',
'systemd-devel', 'meson',
'xfsprogs-devel', 'gcc-c++'])
if self.detected_distro.name == 'rhel' and (
self.detected_distro.version.startswith('9')):
Expand Down
2 changes: 1 addition & 1 deletion fs/xfstests.py.data/btrfs/4k.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ fs_type: !mux
fs_btrfs_4k:
fs: 'btrfs'
args: '-R xunit -L 10 -g quick'
mkfs_opt: '-f -s 4096 -n 4096'
mkfs_opt: '-f -s 4096'
mount_opt: ''
2 changes: 1 addition & 1 deletion fs/xfstests.py.data/btrfs/4k_adv.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ fs_type: !mux
fs_btrfs_4k_adv:
fs: 'btrfs'
args: '-R xunit -L 10 -g quick'
mkfs_opt: '-f -s 4096 -n 4096 -O quota,mixed-bg,block-group-tree'
mkfs_opt: '-f -s 4096 -O quota,mixed-bg,block-group-tree'
mount_opt: ''
2 changes: 1 addition & 1 deletion fs/xfstests.py.data/btrfs/4k_adv_upstream.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ fs_type: !mux
fs_btrfs_4k_adv:
fs: 'btrfs'
args: '-R xunit -L 10 -g quick'
mkfs_opt: '-f -s 4096 -n 4096 -O quota,mixed-bg,block-group-tree'
mkfs_opt: '-f -s 4096 -O quota,mixed-bg,block-group-tree'
mount_opt: ''

run_type: !mux
Expand Down
2 changes: 1 addition & 1 deletion fs/xfstests.py.data/btrfs/4k_auto.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ fs_type: !mux
fs_btrfs_4k_auto:
fs: 'btrfs'
args: '-R xunit -L 10 -g auto'
mkfs_opt: '-f -s 4096 -n 4096'
mkfs_opt: '-f -s 4096'
mount_opt: ''
2 changes: 1 addition & 1 deletion fs/xfstests.py.data/btrfs/4k_upstream.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ fs_type: !mux
fs_btrfs_4k:
fs: 'btrfs'
args: '-R xunit -L 10 -g quick'
mkfs_opt: '-f -s 4096 -n 4096'
mkfs_opt: '-f -s 4096'
mount_opt: ''

run_type: !mux
Expand Down
2 changes: 1 addition & 1 deletion fs/xfstests.py.data/btrfs/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ fs_type: !mux
fs_btrfs_4k:
fs: 'btrfs'
args: '-R xunit generic/001'
mkfs_opt: '-f -s 4096 -n 4096'
mkfs_opt: '-f -s 4096'
mount_opt: ''
2 changes: 1 addition & 1 deletion fs/xfstests.py.data/ext4/dax.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ test_mnt: '/mnt/test_pmem'
fs_type: !mux
fs_ext4_dax:
fs: 'ext4'
args: '-R xunit -e ext4/048 -L 10 -g quick'
args: '-R xunit -e ext4/048 -L 10 -g auto'
mkfs_opt: '-b 65536'
mount_opt: '-o block_validity,dax'

Expand Down
2 changes: 1 addition & 1 deletion fs/xfstests.py.data/xfs/dax.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ test_mnt: '/mnt/test_pmem'
fs_type: !mux
fs_xfs_dax:
fs: 'xfs'
args: '-R xunit -L 10 -g quick'
args: '-R xunit -L 10 -g auto'
mkfs_opt: '-b size=65536 -s size=512 -m reflink=0'
mount_opt: '-o dax'

Expand Down
2 changes: 1 addition & 1 deletion fs/xfstests.py.data/xfstests_disk.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ fs_type: !mux
fs_btrfs_4k:
fs: 'btrfs'
args: '-R xunit -L 10 -g quick'
mkfs_opt: '-f -s 4096 -n 4096'
mkfs_opt: '-f -s 4096'
mount_opt: ''
disk_type: !mux
type: 'disk'
Expand Down
Loading