From 653646cdea5a3b4f96ad708208554fecd4372111 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Wed, 18 Dec 2024 15:50:39 +0100 Subject: [PATCH] don't expect templates to be fully resolved in easyconfigs test suite --- test/easyconfigs/easyconfigs.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/easyconfigs/easyconfigs.py b/test/easyconfigs/easyconfigs.py index 4db5dd7259a..356d73b76a3 100644 --- a/test/easyconfigs/easyconfigs.py +++ b/test/easyconfigs/easyconfigs.py @@ -1474,7 +1474,7 @@ def verify_patch(specdir, patch_spec, checksum_idx, patch_checksums, extension_n patch_path = os.path.join(patch_dir, patch_name) patch_descr = "patch file " + patch_name if extension_name: - patch_descr += "of extension " + extension_name + patch_descr += " of extension " + extension_name # only check actual patch files, not other files being copied via the patch functionality if patch_path.endswith('.patch'): @@ -1724,8 +1724,8 @@ def template_easyconfig_test(self, spec): if key not in DEFAULT_CONFIG and key not in extra_opts: continue - orig_val = resolve_template(ec_dict[key], ec.template_values) - dumped_val = resolve_template(dumped_ec[key], ec.template_values) + orig_val = resolve_template(ec_dict[key], ec.template_values, expect_resolved=False) + dumped_val = resolve_template(dumped_ec[key], ec.template_values, expect_resolved=False) # skip SYSTEM template constant check for 2019b and older toolchain generation easyconfigs # since these fail other CI checks when updated