Merge pull request #4094 from jfgrimm/system-template-constant-depend…

…ency use SYSTEM template constant in dependencies instead of True in framework tests
easybuilders · Oct 13, 2022 · 6cab5e2 · 6cab5e2
2 parents 54655d3 + 48db126
commit 6cab5e2
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/test/framework/easyblock.py b/test/framework/easyblock.py
@@ -871,7 +871,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')),"
             ']',

diff --git a/test/framework/easyconfig.py b/test/framework/easyconfig.py
@@ -1208,7 +1208,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()

diff --git a/test/framework/easyconfigs/test_ecs/b/binutils/binutils-2.25-GCCcore-4.9.3.eb b/test/framework/easyconfigs/test_ecs/b/binutils/binutils-2.25-GCCcore-4.9.3.eb
@@ -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'
diff --git a/test/framework/easyconfigs/test_ecs/b/binutils/binutils-2.26-GCCcore-4.9.3.eb b/test/framework/easyconfigs/test_ecs/b/binutils/binutils-2.26-GCCcore-4.9.3.eb
@@ -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'
diff --git a/test/framework/easyconfigs/test_ecs/g/gzip/gzip-1.4-GCC-4.6.3.eb b/test/framework/easyconfigs/test_ecs/g/gzip/gzip-1.4-GCC-4.6.3.eb
@@ -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

diff --git a/test/framework/easyconfigs/test_ecs/t/toy/toy-0.0-deps.eb b/test/framework/easyconfigs/test_ecs/t/toy/toy-0.0-deps.eb
@@ -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),
 ]