Skip to content
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

Jump to bottom

Xfstest fixes with upstream as a target #2778

Merged
merged 4 commits into from
Mar 29, 2024
Merged

Xfstest fixes with upstream as a target #2778

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
74f107d
fs/xfstests: Add inih devel dependency for xfsprog
sacsant Mar 20, 2024
8948eff
fs/xfstests: Move local.config copy operation
sacsant Mar 20, 2024
144455c
fs/xfstests: Move package installation after variable initialization
sacsant Mar 27, 2024
3fc8e18
fs/xfstests: Update package dependency
sacsant Mar 27, 2024
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
23 changes: 13 additions & 10 deletions fs/xfstests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,17 +177,21 @@ def __setUp_packages(self):
packages.extend(['acl', 'bc', 'indent', 'libtool', 'lvm2',
'xfsdump', 'psmisc', 'sed', 'libacl-devel',
'libattr-devel', 'libaio-devel', 'libuuid-devel',
'openssl-devel', 'xfsprogs-devel', 'gettext',
'libblkid-devel', 'lzo-devel', 'zlib-devel',
'e2fsprogs-devel', 'asciidoc', 'xmlto',
'libzstd-devel', 'systemd-devel', 'meson',
'gcc-c++'])
'xfsprogs-devel', 'gcc-c++'])
if self.detected_distro.name == 'rhel' and (
self.detected_distro.version.startswith('9')):
packages.extend(['inih-devel'])

if self.detected_distro.name == 'SuSE':
packages.extend(['libbtrfs-devel', 'libcap-progs',
'liburcu-devel', 'libinih-devel'])
'liburcu-devel', 'libinih-devel',
'libopenssl-devel', 'gettext-tools'])
else:
packages.extend(['btrfs-progs-devel', 'userspace-rcu-devel'])
packages.extend(['btrfs-progs-devel', 'userspace-rcu-devel'
'openssl-devel', 'gettext'])

packages_remove = ['indent', 'btrfs-progs-devel']
if self.detected_distro.name == 'rhel' and (
Expand Down Expand Up @@ -218,9 +222,6 @@ def setUp(self):
self.use_dd = True

self.dev_type = self.params.get('type', default='loop')

self.__setUp_packages()

self.logflag = self.params.get('logdev', default=False)
self.fs_to_test = self.params.get('fs', default='ext4')
self.args = self.params.get('args', default='-g quick')
Expand All @@ -243,9 +244,14 @@ def setUp(self):
if os.path.exists(f"{self.teststmpdir}/results"):
shutil.rmtree(f"{self.teststmpdir}/results")

shutil.copyfile(self.get_data('local.config'),
os.path.join(self.teststmpdir, 'local.config'))

self.devices = []
self.part = None

self.__setUp_packages()

if self.run_type == 'upstream':
prefix = "/usr/local"
bin_prefix = "/usr/local/bin"
Expand Down Expand Up @@ -348,9 +354,6 @@ def setUp(self):
if self.fs_to_test == "btrfs":
self.num_loop_dev = 5

shutil.copyfile(self.get_data('local.config'),
os.path.join(self.teststmpdir, 'local.config'))

if self.dev_type == 'loop':
loop_size = self.params.get('loop_size', default='7GiB')
if not self.base_disk:
Expand Down
Loading