Skip to content

Avoid creating empty modulefile directories when using modaltsoftname #2168

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Mar 17, 2017
Merged

Avoid creating empty modulefile directories when using modaltsoftname #2168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b7396e6
Use module name from naming scheme rather than deriving path
geimer Mar 16, 2017
d1afaa0
enhance modaltsoftname test to check which software/modules directori…
boegel Mar 17, 2017
cfd904a
rename parent_subdir to mod_subdir to avoid confusion
boegel Mar 17, 2017
1c8af62
sort in modaltsoftname test
boegel Mar 17, 2017
4c26eee
Merge pull request #16 from boegel/fix_modaltsoftname
geimer Mar 17, 2017
58ebdf8
Fix test to not assume Lua module syntax
geimer Mar 17, 2017
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
6 changes: 3 additions & 3 deletions easybuild/framework/easyblock.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1519,13 +1519,13 @@ def fetch_step(self, skip_checksums=False):
# create parent dirs in install and modules path already
# this is required when building in parallel
mod_symlink_paths = ActiveMNS().det_module_symlink_paths(self.cfg)
parent_subdir = os.path.dirname(self.install_subdir)
mod_subdir = os.path.dirname(ActiveMNS().det_full_module_name(self.cfg))
pardirs = [
self.installdir,
os.path.join(self.installdir_mod, parent_subdir),
os.path.join(self.installdir_mod, mod_subdir),
]
for mod_symlink_path in mod_symlink_paths:
pardirs.append(os.path.join(install_path('mod'), mod_symlink_path, parent_subdir))
pardirs.append(os.path.join(install_path('mod'), mod_symlink_path, mod_subdir))

self.log.info("Checking dirs that need to be created: %s" % pardirs)
for pardir in pardirs:
Expand Down
29 changes: 28 additions & 1 deletion test/framework/toy_build.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1282,15 +1282,42 @@ def test_toy_modaltsoftname(self):
toy_ec_txt,
"versionsuffix = '-two'",
"dependencies = [('toy', '0.0', '-one')]",
"modaltsoftname = 'toytwo'",
])
write_file(ec2, ec2_txt)

extra_args = [
'--module-naming-scheme=HierarchicalMNS',
'--robot-paths=%s'%self.test_prefix,
'--robot-paths=%s' % self.test_prefix,
]
self.test_toy_build(ec_file=self.test_prefix, verify=False, extra_args=extra_args, raise_error=True)

software_path = os.path.join(self.test_installpath, 'software', 'Core')
modules_path = os.path.join(self.test_installpath, 'modules', 'all', 'Core')

# install dirs for both installations should be there (using original software name)
self.assertTrue(os.path.exists(os.path.join(software_path, 'toy', '0.0-one', 'bin', 'toy')))
self.assertTrue(os.path.exists(os.path.join(software_path, 'toy', '0.0-two', 'bin', 'toy')))

toytwo_name = '0.0-two'
yot_name = '0.0-one'
if get_module_syntax() == 'Lua':
toytwo_name += '.lua'
yot_name += '.lua'

# modules for both installations with alternative name should be there
self.assertTrue(os.path.exists(os.path.join(modules_path, 'toytwo', toytwo_name)))
self.assertTrue(os.path.exists(os.path.join(modules_path, 'yot', yot_name)))

# only subdirectories for software should be created
self.assertEqual(os.listdir(software_path), ['toy'])
self.assertEqual(sorted(os.listdir(os.path.join(software_path, 'toy'))), ['0.0-one', '0.0-two'])

# only subdirectories for modules with alternative names should be created
self.assertEqual(sorted(os.listdir(modules_path)), ['toytwo', 'yot'])
self.assertEqual(os.listdir(os.path.join(modules_path, 'toytwo')), [toytwo_name])
self.assertEqual(os.listdir(os.path.join(modules_path, 'yot')), [yot_name])


def suite():
""" return all the tests in this file """
Expand Down