Skip to content

only retain runtime dependencies of toolchain in Toolchain instance #5048

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
boegel merged 2 commits into from
Nov 14, 2025
Merged

only retain runtime dependencies of toolchain in Toolchain instance #5048

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
5be4b97
Fix error due to access to toolchain build dependencies
Flamefire Nov 14, 2025
8285fc2
enhance test_exts_deps_build_env to verify fix made in #5048
boegel Nov 14, 2025
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
2 changes: 1 addition & 1 deletion easybuild/framework/easyconfig/easyconfig.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1279,7 +1279,7 @@ def toolchain(self):
else:
self.log.debug("Found easyconfig for toolchain %s version %s: %s", tcname, tcversion, tc_ecfile)
tc_ec = process_easyconfig(tc_ecfile)[0]
tcdeps = tc_ec['ec'].dependencies()
tcdeps = tc_ec['ec'].dependencies(runtime_only=True)
self.log.debug("Toolchain dependencies based on easyconfig: %s", tcdeps)

self._toolchain = get_toolchain(self['toolchain'], self['toolchainopts'],
Expand Down
20 changes: 20 additions & 0 deletions test/framework/easyblock.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3809,6 +3809,26 @@ def test_exts_deps_build_env(self):
self.fail(f"Unknown type of environment variable: ${env_var}")
self.assertTrue(regex.search(log_txt), f"Pattern '{regex.pattern}' not found in log output")

# verify fix made in https://github.com/easybuilders/easybuild-framework/pull/5048
test_ec_txt = read_file(toy_ec)
test_ec_txt += textwrap.dedent("""
toolchain = {'name': 'GCCcore', 'version': '12.3.0'}
""")
write_file(test_ec, test_ec_txt)
args = [
test_ec,
'--rebuild',
'--debug',
]
with self.mocked_stdout_stderr():
with self.log_to_testlogfile():
self.eb_main(args, raise_error=True, do_build=True, verbose=True)

log_txt = read_file(self.logfile)

regex = re.compile(r"\[SUCCESS\] toy/0.0-GCCcore-12.3.0", re.M)
self.assertTrue(regex.search(log_txt), f"Pattern '{regex.pattern}' not found in log output")


def suite(loader=None):
""" return all the tests in this file """
Expand Down
6 changes: 5 additions & 1 deletion test/framework/easyconfigs/test_ecs/g/GCCcore/GCCcore-12.3.0.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,11 @@ source_urls = [
'http://ftpmirror.gnu.org/%(namelower)s/%(namelower)s-%(version)s', # GCC auto-resolving HTTP mirror
]

#gcc_name = 'GCC'
# only here to verify the fix made in https://github.com/easybuilders/easybuild-framework/pull/5048,
# see also test_exts_deps_build_env
builddependencies = [
('gzip', '1.4'),
]

sources = [
SOURCELOWER_TAR_BZ2,
Expand Down