Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 38 additions & 1 deletion test/framework/easyblock.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
from easybuild.tools.config import get_module_syntax, update_build_option
from easybuild.tools.environment import modify_env
from easybuild.tools.filetools import change_dir, copy_dir, copy_file, mkdir, read_file, remove_dir, remove_file
from easybuild.tools.filetools import verify_checksum, write_file
from easybuild.tools.filetools import symlink, verify_checksum, write_file
from easybuild.tools.module_generator import module_generator
from easybuild.tools.modules import EnvironmentModules, Lmod, ModEnvVarType, reset_module_caches
from easybuild.tools.version import get_git_revision, this_is_easybuild
Expand Down Expand Up @@ -627,6 +627,43 @@ def test_make_module_req(self):
logtxt = read_file(eb.logfile)
self.assertTrue(re.search(r"WARNING Non-path variables found in module load env.*NONPATH", logtxt, re.M))

delattr(eb.module_load_environment, 'NONPATH')

# make sure that entries that symlink to another directory are retained;
# the test case inspired by the directory structure for old imkl versions (like 2020.4)
remove_dir(eb.installdir)

# lib/ symlinked to libraries/
real_libdir = os.path.join(eb.installdir, 'libraries')
mkdir(real_libdir, parents=True)
symlink(real_libdir, os.path.join(eb.installdir, 'lib'))

# lib/intel64/ symlinked to lib/intel64_lin/
mkdir(os.path.join(eb.installdir, 'lib', 'intel64_lin'), parents=True)
symlink(os.path.join(eb.installdir, 'lib', 'intel64_lin'), os.path.join(eb.installdir, 'lib', 'intel64'))

# library file present in lib/intel64
write_file(os.path.join(eb.installdir, 'lib', 'intel64', 'libfoo.so'), 'libfoo.so')

# lib64/ symlinked to lib/
symlink(os.path.join(eb.installdir, 'lib'), os.path.join(eb.installdir, 'lib64'))

eb.module_load_environment.LD_LIBRARY_PATH = [os.path.join('lib', 'intel64')]
eb.module_load_environment.LIBRARY_PATH = eb.module_load_environment.LD_LIBRARY_PATH
with eb.module_generator.start_module_creation():
txt = eb.make_module_req()

if get_module_syntax() == 'Tcl':
self.assertTrue(re.search(r"^prepend-path\s+LD_LIBRARY_PATH\s+\$root/lib/intel64$", txt, re.M))
self.assertTrue(re.search(r"^prepend-path\s+LIBRARY_PATH\s+\$root/lib/intel64\n$", txt, re.M))
elif get_module_syntax() == 'Lua':
self.assertTrue(re.search(r'^prepend_path\("LD_LIBRARY_PATH", pathJoin\(root, "lib/intel64"\)\)$',
txt, re.M))
self.assertTrue(re.search(r'^prepend_path\("LIBRARY_PATH", pathJoin\(root, "lib/intel64"\)\)$',
txt, re.M))
else:
self.fail("Unknown module syntax: %s" % get_module_syntax())

# cleanup
eb.close_log()
os.remove(eb.logfile)
Expand Down
Loading