Skip to content

Commit 48db126

Browse files
committed
use SYSTEM template constant in dependencies instead of True
1 parent 38f415d commit 48db126

File tree

6 files changed

+6
-6
lines changed

6 files changed

+6
-6
lines changed

test/framework/easyblock.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -870,7 +870,7 @@ def test_make_module_dep_of_dep_hmns(self):
870870
'description = "test easyconfig"',
871871
"toolchain = {'name': 'foss', 'version': '2018a'}",
872872
'dependencies = [',
873-
" ('GCC', '6.4.0-2.28', '', True),"
873+
" ('GCC', '6.4.0-2.28', '', SYSTEM),"
874874
" ('hwloc', '1.11.8', '', ('GCC', '6.4.0-2.28')),",
875875
" ('OpenMPI', '2.1.2', '', ('GCC', '6.4.0-2.28')),"
876876
']',

test/framework/easyconfig.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1188,7 +1188,7 @@ def test_java_wrapper_templating(self):
11881188
'homepage = "https://example.com"',
11891189
'description = "test easyconfig"',
11901190
'toolchain = {"name":"GCC", "version": "4.6.3"}',
1191-
'dependencies = [("Java", "11", "", True)]',
1191+
'dependencies = [("Java", "11", "", SYSTEM)]',
11921192
'modloadmsg = "Java: %(javaver)s, %(javamajver)s, %(javashortver)s"',
11931193
])
11941194
self.prep()

test/framework/easyconfigs/test_ecs/b/binutils/binutils-2.25-GCCcore-4.9.3.eb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ source_urls = [GNU_SOURCE]
2020
# # zlib required, but being linked in statically, so not a runtime dep
2121
# ('zlib', '1.2.8'),
2222
# # use same binutils version that was used when building GCC toolchain, to 'bootstrap' this binutils
23-
# ('binutils', version, '', True)
23+
# ('binutils', version, '', SYSTEM)
2424
#]
2525

2626
moduleclass = 'tools'

test/framework/easyconfigs/test_ecs/b/binutils/binutils-2.26-GCCcore-4.9.3.eb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ source_urls = [GNU_SOURCE]
2020
# # zlib required, but being linked in statically, so not a runtime dep
2121
# ('zlib', '1.2.8'),
2222
# # use same binutils version that was used when building GCC toolchain, to 'bootstrap' this binutils
23-
# ('binutils', version, '', True)
23+
# ('binutils', version, '', SYSTEM)
2424
#]
2525

2626
moduleclass = 'tools'

test/framework/easyconfigs/test_ecs/g/gzip/gzip-1.4-GCC-4.6.3.eb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ sources = ['%(name)s-%(version)s.tar.gz']
2626
# download location for source files
2727
source_urls = [GNU_SOURCE]
2828

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

3232
# make sure the gzip and gunzip binaries are available after installation

test/framework/easyconfigs/test_ecs/t/toy/toy-0.0-deps.eb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ checksums = [[
2020
patches = ['toy-0.0_fix-silly-typo-in-printf-statement.patch']
2121

2222
dependencies = [
23-
('intel', '2018a', '', True),
23+
('intel', '2018a', '', SYSTEM),
2424
('GCC/6.4.0-2.28', EXTERNAL_MODULE),
2525
]
2626

0 commit comments

Comments
 (0)