Skip to content

Commit 33acc14

Browse files
Merge pull request #2922 from Pavithra1602/fio_fix
Fix fiotest failure due to package dependency.
2 parents 276b4a3 + ead0033 commit 33acc14

File tree

1 file changed

+12
-11
lines changed

1 file changed

+12
-11
lines changed

io/disk/fiotest.py

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -89,22 +89,23 @@ def setUp(self):
8989
self.cancel("btrfs is not supported with \
9090
RHEL 7.4 onwards")
9191

92+
pkg_list = ['libaio-devel', 'cmake', 'gcc-c++']
9293
if distro.detect().name in ['Ubuntu', 'debian']:
93-
pkg_list = ['libaio-dev']
94+
pkg_list.append('libaio-dev')
9495
if fstype == 'btrfs':
9596
pkg_list.append('btrfs-progs')
9697
elif distro.detect().name is 'SuSE':
97-
pkg_list = ['libaio1', 'libaio-devel']
98+
pkg_list.append('libaio1')
9899
else:
99-
pkg_list = ['libaio', 'libaio-devel']
100-
if self.disk_type == 'nvdimm':
101-
pkg_list.extend(['autoconf', 'pkg-config'])
102-
if distro.detect().name == 'SuSE':
103-
pkg_list.extend(['ndctl', 'libnuma-devel',
104-
'libndctl-devel'])
105-
else:
106-
pkg_list.extend(['ndctl', 'daxctl', 'numactl-devel',
107-
'ndctl-devel', 'daxctl-devel'])
100+
pkg_list.append('libaio')
101+
if self.disk_type == 'nvdimm':
102+
pkg_list.extend(['autoconf', 'pkg-config'])
103+
if distro.detect().name == 'SuSE':
104+
pkg_list.extend(['ndctl', 'libnuma-devel',
105+
'libndctl-devel'])
106+
else:
107+
pkg_list.extend(['ndctl', 'daxctl', 'numactl-devel',
108+
'ndctl-devel', 'daxctl-devel'])
108109
if raid_needed:
109110
pkg_list.append('mdadm')
110111

0 commit comments

Comments
 (0)