Skip to content

Commit ead0033

Browse files
committed
Fix fiotest failure due to package dependency.
nvdimm related packages are not getting installed for sles as they are under else condition, moved them out of else condition and added cmake and gcc-c++ dependent packages as compilation was failing due to missing packages. Signed-off-by: Pavithra <pavrampu@linux.vnet.ibm.com>
1 parent 3b4416d commit ead0033

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)