Skip to content
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

Jump to bottom

create lib -> lib64 symlink (or vice versa) *before* running postinstallcmds #4435

Merged
merged 2 commits into from
Feb 8, 2024
Merged

create lib -> lib64 symlink (or vice versa) *before* running postinstallcmds #4435

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
571b94d
Move post install commands after lib64 symlinking
ocaisa Jan 15, 2024
92e9fe1
fix broken tests after symlinking lib -> lib64 before postinstallcmds
boegel Feb 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 6 additions & 6 deletions easybuild/framework/easyblock.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3019,12 +3019,6 @@ def post_install_step(self):
- run post install commands if any were specified
"""

self.run_post_install_commands()
self.apply_post_install_patches()
self.print_post_install_messages()

self.fix_shebang()

lib_dir = os.path.join(self.installdir, 'lib')
lib64_dir = os.path.join(self.installdir, 'lib64')

Expand All @@ -3045,6 +3039,12 @@ def post_install_step(self):
# create *relative* 'lib' symlink to 'lib64';
symlink('lib64', lib_dir, use_abspath_source=False)

self.run_post_install_commands()
self.apply_post_install_patches()
self.print_post_install_messages()

self.fix_shebang()

def sanity_check_step(self, *args, **kwargs):
"""
Do a sanity check on the installation
Expand Down
42 changes: 24 additions & 18 deletions test/framework/toy_build.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2414,7 +2414,14 @@ def test_sanity_check_paths_lib64(self):

# modify test easyconfig: move lib/libtoy.a to lib64/libtoy.a
ectxt = re.sub(r"\s*'files'.*", "'files': ['bin/toy', ('lib/libtoy.a', 'lib/libfoo.a')],", ectxt)
postinstallcmd = "mkdir %(installdir)s/lib64 && mv %(installdir)s/lib/libtoy.a %(installdir)s/lib64/libtoy.a"
postinstallcmd = ' && '.join([
# remove lib64 symlink (if it's there)
"rm -f %(installdir)s/lib64",
# create empty lib64 dir
"mkdir %(installdir)s/lib64",
# move libtoy.a
"mv %(installdir)s/lib/libtoy.a %(installdir)s/lib64/libtoy.a",
])
ectxt = re.sub("postinstallcmds.*", "postinstallcmds = ['%s']" % postinstallcmd, ectxt)

test_ec = os.path.join(self.test_prefix, 'toy-0.0.eb')
Expand Down Expand Up @@ -3829,7 +3836,6 @@ def test_toy_build_lib_lib64_symlink(self):
toy_ec = os.path.join(test_ecs, 't', 'toy', 'toy-0.0.eb')

test_ec_txt = read_file(toy_ec)
test_ec_txt += "\npostinstallcmds += ['mv %(installdir)s/lib %(installdir)s/lib64']"

test_ec = os.path.join(self.test_prefix, 'test.eb')
write_file(test_ec, test_ec_txt)
Expand All @@ -3842,30 +3848,30 @@ def test_toy_build_lib_lib64_symlink(self):
lib_path = os.path.join(toy_installdir, 'lib')
lib64_path = os.path.join(toy_installdir, 'lib64')

# lib64 subdir exists, is not a symlink
self.assertExists(lib64_path)
self.assertTrue(os.path.isdir(lib64_path))
self.assertFalse(os.path.islink(lib64_path))

# lib subdir is a symlink to lib64 subdir
# lib subdir exists, is not a symlink
self.assertExists(lib_path)
self.assertTrue(os.path.isdir(lib_path))
self.assertTrue(os.path.islink(lib_path))
self.assertTrue(os.path.samefile(lib_path, lib64_path))
self.assertFalse(os.path.islink(lib_path))

# lib symlink should point to a relative path
self.assertFalse(os.path.isabs(os.readlink(lib_path)))
# lib64 subdir is a symlink to lib subdir
self.assertExists(lib64_path)
self.assertTrue(os.path.isdir(lib64_path))
self.assertTrue(os.path.islink(lib64_path))
self.assertTrue(os.path.samefile(lib64_path, lib_path))

# lib64 symlink should point to a relative path
self.assertFalse(os.path.isabs(os.readlink(lib64_path)))

# cleanup and try again with --disable-lib-lib64-symlink
remove_dir(self.test_installpath)
with self.mocked_stdout_stderr():
self._test_toy_build(ec_file=test_ec, extra_args=['--disable-lib-lib64-symlink'])
self._test_toy_build(ec_file=test_ec, extra_args=['--disable-lib64-lib-symlink'])

self.assertExists(lib64_path)
self.assertNotExists(lib_path)
self.assertNotIn('lib', os.listdir(toy_installdir))
self.assertTrue(os.path.isdir(lib64_path))
self.assertFalse(os.path.islink(lib64_path))
self.assertExists(lib_path)
self.assertNotExists(lib64_path)
self.assertNotIn('lib64', os.listdir(toy_installdir))
self.assertTrue(os.path.isdir(lib_path))
self.assertFalse(os.path.islink(lib_path))

def test_toy_build_sanity_check_linked_libs(self):
"""Test sanity checks for banned/requires libraries."""
Expand Down