Skip to content

Commit

Permalink
Merge pull request easybuilders#3425 from boegel/fix_test_suite
Browse files Browse the repository at this point in the history
use non-system toolchain for testing `--module-only` for ELPA and FFTW easyblocks, since they rely on toolchain options like 'pic' being set
  • Loading branch information
Micket authored Aug 28, 2024
2 parents 6131d91 + 0b141e8 commit cb13e2f
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions test/easyblocks/module.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@
from easybuild.easyblocks.generic.pythonbundle import PythonBundle
from easybuild.easyblocks.generic.cargopythonbundle import CargoPythonBundle
from easybuild.easyblocks.gcc import EB_GCC
from easybuild.easyblocks.elpa import EB_ELPA
from easybuild.easyblocks.fftw import EB_FFTW
from easybuild.easyblocks.fftwmpi import EB_FFTW_period_MPI
from easybuild.easyblocks.imkl_fftw import EB_imkl_minus_FFTW
from easybuild.easyblocks.openfoam import EB_OpenFOAM
Expand Down Expand Up @@ -290,8 +292,9 @@ def template_module_only_test(self, easyblock, name, version='1.3.2', extra_txt=
os.environ['EBROOTJULIA'] = '/fake/install/prefix/Julia/1.6.7'
os.environ['EBVERSIONJULIA'] = '1.6.7'

elif app_class == EB_OpenFOAM:
# proper toolchain must be used for OpenFOAM(-Extend), to determine value to set for $WM_COMPILER
# proper toolchain must be used for OpenFOAM(-Extend), to determine value to set for $WM_COMPILER;
# non-system toolchain must be used for ELPA + FFTW*, because no toolchain options are set for system toolchain
if app_class in (EB_ELPA, EB_FFTW, EB_FFTW_period_MPI, EB_OpenFOAM):
write_file(os.path.join(tmpdir, 'GCC', '4.9.3-2.25'), '\n'.join([
'#%Module',
'setenv EBROOTGCC %s' % tmpdir,
Expand Down

0 comments on commit cb13e2f

Please sign in to comment.