Skip to content

Commit 5487b19

Browse files
committed
ngci/tests: Cleanup handling of allyes/allmod compiler exceptions
1 parent 314baa5 commit 5487b19

1 file changed

Lines changed: 10 additions & 7 deletions

File tree

etc/tests.py

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -256,19 +256,22 @@ def full_compile_test(args, suite=None):
256256
# Doesn't exist
257257
#k('ppc64le_allyesconfig', image)
258258

259-
# GCC 5.5.0 fails on various things for allyes/allmod
260-
tmp_image = image.replace('korg@5.5.0', 'korg@8.5.0')
259+
allyesmod_image = image
260+
if not image_at_least(image, ['fedora@31', 'korg@8.5.0']):
261+
# GCC 5.5.0 fails on various things for allyes/allmod
262+
allyesmod_image = 'korg@8.5.0'
263+
261264
# 64-bit Book3S BE
262-
k('allyesconfig', tmp_image, merge_config=no_gcc_plugins)
265+
k('allyesconfig', allyesmod_image, merge_config=no_gcc_plugins)
263266
# 64-bit Book3S BE
264-
k('allmodconfig', tmp_image, merge_config=no_gcc_plugins)
267+
k('allmodconfig', allyesmod_image, merge_config=no_gcc_plugins)
265268
# 64-bit Book3S LE
266-
k('ppc64le_allmodconfig', tmp_image, merge_config=no_gcc_plugins)
269+
k('ppc64le_allmodconfig', allyesmod_image, merge_config=no_gcc_plugins)
267270
# 32-bit Book3S BE (korg 5.5.0 doesn't build)
268-
k('ppc32_allmodconfig', tmp_image, merge_config=no_gcc_plugins)
271+
k('ppc32_allmodconfig', allyesmod_image, merge_config=no_gcc_plugins)
269272
# 64-bit BOOK3E BE (korg 5.5.0 doesn't build)
270273
# FIXME Broken due to start_text_address problems
271-
# k('ppc64_book3e_allmodconfig', tmp_image, merge_config=no_gcc_plugins)
274+
# k('ppc64_book3e_allmodconfig', allyesmod_image, merge_config=no_gcc_plugins)
272275

273276
#########################################
274277
# specific machine/platform configs

0 commit comments

Comments
 (0)