Skip to content

use SYSTEM template constant in dependencies instead of True in framework tests #4094

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 1 commit into from
Oct 13, 2022
Merged

use SYSTEM template constant in dependencies instead of True in framework tests #4094

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 test/framework/easyblock.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -870,7 +870,7 @@ def test_make_module_dep_of_dep_hmns(self):
'description = "test easyconfig"',
"toolchain = {'name': 'foss', 'version': '2018a'}",
'dependencies = [',
" ('GCC', '6.4.0-2.28', '', True),"
" ('GCC', '6.4.0-2.28', '', SYSTEM),"
" ('hwloc', '1.11.8', '', ('GCC', '6.4.0-2.28')),",
" ('OpenMPI', '2.1.2', '', ('GCC', '6.4.0-2.28')),"
']',
Expand Down
2 changes: 1 addition & 1 deletion test/framework/easyconfig.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1188,7 +1188,7 @@ def test_java_wrapper_templating(self):
'homepage = "https://example.com"',
'description = "test easyconfig"',
'toolchain = {"name":"GCC", "version": "4.6.3"}',
'dependencies = [("Java", "11", "", True)]',
'dependencies = [("Java", "11", "", SYSTEM)]',
'modloadmsg = "Java: %(javaver)s, %(javamajver)s, %(javashortver)s"',
])
self.prep()
Expand Down
2 changes: 1 addition & 1 deletion test/framework/easyconfigs/test_ecs/b/binutils/binutils-2.25-GCCcore-4.9.3.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ source_urls = [GNU_SOURCE]
# # zlib required, but being linked in statically, so not a runtime dep
# ('zlib', '1.2.8'),
# # use same binutils version that was used when building GCC toolchain, to 'bootstrap' this binutils
# ('binutils', version, '', True)
# ('binutils', version, '', SYSTEM)
#]

moduleclass = 'tools'
2 changes: 1 addition & 1 deletion test/framework/easyconfigs/test_ecs/b/binutils/binutils-2.26-GCCcore-4.9.3.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ source_urls = [GNU_SOURCE]
# # zlib required, but being linked in statically, so not a runtime dep
# ('zlib', '1.2.8'),
# # use same binutils version that was used when building GCC toolchain, to 'bootstrap' this binutils
# ('binutils', version, '', True)
# ('binutils', version, '', SYSTEM)
#]

moduleclass = 'tools'
2 changes: 1 addition & 1 deletion test/framework/easyconfigs/test_ecs/g/gzip/gzip-1.4-GCC-4.6.3.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ sources = ['%(name)s-%(version)s.tar.gz']
# download location for source files
source_urls = [GNU_SOURCE]

hiddendependencies = [('toy', '0.0', '-deps', True)]
hiddendependencies = [('toy', '0.0', '-deps', SYSTEM)]
dependencies = hiddendependencies # hidden deps must be included in list of deps

# make sure the gzip and gunzip binaries are available after installation
Expand Down
2 changes: 1 addition & 1 deletion test/framework/easyconfigs/test_ecs/t/toy/toy-0.0-deps.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ checksums = [[
patches = ['toy-0.0_fix-silly-typo-in-printf-statement.patch']

dependencies = [
('intel', '2018a', '', True),
('intel', '2018a', '', SYSTEM),
('GCC/6.4.0-2.28', EXTERNAL_MODULE),
]

Expand Down