From 6996186d36e9f007ddae2ed92eccb9d5c9a43089 Mon Sep 17 00:00:00 2001 From: Alexander Grund Date: Tue, 5 Jul 2022 11:05:25 +0200 Subject: [PATCH] Fix test comparing YEB and EB files Use the same templates in the compared EC and YEB files. --- test/framework/easyconfigs/yeb/Python-2.7.10-intel-2018a.yeb | 2 +- test/framework/easyconfigs/yeb/SQLite-3.8.10.2-foss-2018a.yeb | 2 +- test/framework/yeb.py | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/framework/easyconfigs/yeb/Python-2.7.10-intel-2018a.yeb b/test/framework/easyconfigs/yeb/Python-2.7.10-intel-2018a.yeb index 527f7bf8a5..e6cb14adcb 100644 --- a/test/framework/easyconfigs/yeb/Python-2.7.10-intel-2018a.yeb +++ b/test/framework/easyconfigs/yeb/Python-2.7.10-intel-2018a.yeb @@ -15,7 +15,7 @@ description: | toolchain: {name: intel, version: 2018a} toolchainopts: {pic: True, opt: True, optarch: True} -source_urls: ['http://www.python.org/ftp/python/%(version)s/'] +source_urls: ['http://www.python.org/ftp/%(namelower)s/%(version)s/'] sources: [*SOURCE_TGZ] # python needs bzip2 to build the bz2 package diff --git a/test/framework/easyconfigs/yeb/SQLite-3.8.10.2-foss-2018a.yeb b/test/framework/easyconfigs/yeb/SQLite-3.8.10.2-foss-2018a.yeb index a9d0afea39..acdfe5fa16 100644 --- a/test/framework/easyconfigs/yeb/SQLite-3.8.10.2-foss-2018a.yeb +++ b/test/framework/easyconfigs/yeb/SQLite-3.8.10.2-foss-2018a.yeb @@ -1,5 +1,5 @@ _internal_variables_: - - &versionstr 3081002 + - &versionstr '%(version_major)s081002' easyblock: ConfigureMake diff --git a/test/framework/yeb.py b/test/framework/yeb.py index 74a2a47875..34fbff530d 100644 --- a/test/framework/yeb.py +++ b/test/framework/yeb.py @@ -102,8 +102,8 @@ def test_parse_yeb(self): ec_eb = EasyConfig(ec_file) for key in sorted(ec_yeb.asdict()): - eb_val = ec_eb[key] - yeb_val = ec_yeb[key] + eb_val = ec_eb.get_ref(key) + yeb_val = ec_yeb.get_ref(key) if key == 'description': # multi-line string is always terminated with '\n' in YAML, so strip it off yeb_val = yeb_val.strip()