From d7f53d8292def402d1ffdc276df7d6b0a36cc0cf Mon Sep 17 00:00:00 2001 From: Alex Domingo Date: Tue, 11 Feb 2025 01:23:35 +0100 Subject: [PATCH] remove SystemCompiler from CI in favour of SystemCompilerGCC --- easybuild/easyblocks/generic/systemcompiler.py | 1 - test/easyblocks/module.py | 7 ++++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/easybuild/easyblocks/generic/systemcompiler.py b/easybuild/easyblocks/generic/systemcompiler.py index 0743874d091..35f07f9e34d 100644 --- a/easybuild/easyblocks/generic/systemcompiler.py +++ b/easybuild/easyblocks/generic/systemcompiler.py @@ -49,7 +49,6 @@ 'GCCcore': 'gcc', 'icc': 'icc', 'ifort': 'ifort', - 'systemcompilergcc-py-sw': 'gcc', # used in test suite } diff --git a/test/easyblocks/module.py b/test/easyblocks/module.py index 463dcf6543f..d598f34e46a 100644 --- a/test/easyblocks/module.py +++ b/test/easyblocks/module.py @@ -443,8 +443,13 @@ def innertest(self): for easyblock in easyblocks: eb_fn = os.path.basename(easyblock) - # dynamically define new inner functions that can be added as class methods to ModuleOnlyTest + if eb_fn == 'systemcompiler.py': + # skip SystemCompiler, will be tested through its childs + continue + + # dynamically define new inner functions that can be added as class methods to ModuleOnlyTest + if eb_fn == 'systemcompilergcc.py': # use GCC as name when testing SystemCompiler easyblock innertest = make_inner_test(easyblock, name='GCC', version='system') elif eb_fn == 'systemmpi.py':