From ff80fa2e27bb19a957dfc8012181eac2ef802905 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Sun, 13 Mar 2022 11:06:32 +0100 Subject: [PATCH] remove exception for using dummy toolchain in EasyBuild easyconfigs --- test/easyconfigs/easyconfigs.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/test/easyconfigs/easyconfigs.py b/test/easyconfigs/easyconfigs.py index 95922f7a545..0cdc545fdac 100644 --- a/test/easyconfigs/easyconfigs.py +++ b/test/easyconfigs/easyconfigs.py @@ -1214,11 +1214,9 @@ def template_easyconfig_test(self, spec): self.assertTrue(ec['version'], app.version) # make sure that deprecated 'dummy' toolchain is no longer used, should use 'system' toolchain instead - # but give recent EasyBuild easyconfigs special treatment to avoid breaking "eb --install-latest-eb-release" ec_fn = os.path.basename(spec) - if not (ec_fn == 'EasyBuild-3.9.4.eb' or ec_fn.startswith('EasyBuild-4.')): - error_msg_tmpl = "%s should use 'system' toolchain rather than deprecated 'dummy' toolchain" - self.assertFalse(ec['toolchain']['name'] == 'dummy', error_msg_tmpl % os.path.basename(spec)) + error_msg_tmpl = "%s should use 'system' toolchain rather than deprecated 'dummy' toolchain" + self.assertFalse(ec['toolchain']['name'] == 'dummy', error_msg_tmpl % os.path.basename(spec)) # make sure that $root is not used, since it is not compatible with module files in Lua syntax res = re.findall(r'.*\$root.*', ec.rawtxt, re.M)