From de43a78dd932f4fe14b1c6c895c01a8f763ce202 Mon Sep 17 00:00:00 2001 From: Mikael Simberg Date: Wed, 15 Jul 2026 15:13:54 +0200 Subject: [PATCH 1/2] Be more specific about which icon uenvs are xfail in UenvFixincludes test --- checks/prgenv/uenv_fixincludes.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/checks/prgenv/uenv_fixincludes.py b/checks/prgenv/uenv_fixincludes.py index 8d45e4013..a59d0b01c 100644 --- a/checks/prgenv/uenv_fixincludes.py +++ b/checks/prgenv/uenv_fixincludes.py @@ -7,7 +7,13 @@ import reframe.utility.sanity as sn -@rfm.xfail('ICON uenvs are based on old versions of spack that don\'t fix GCC\'s includes', lambda self: self.current_environ.name.startswith('icon')) # noqa:E501 +@rfm.xfail( + "ICON uenvs are based on old versions of spack that don't fix GCC's includes", + lambda self: ( + self.current_environ.name.startswith("icon_25_2_v4") + or self.current_environ.name.startswith("icon-dsl_25_12_v2") + ), +) # noqa:E501 @rfm.simple_test class UenvFixincludes(rfm.RunOnlyRegressionTest): descr = ''' From 2168d714d39800037d90acdfb7db904af7c861bc Mon Sep 17 00:00:00 2001 From: Mikael Simberg Date: Wed, 15 Jul 2026 17:20:07 +0200 Subject: [PATCH 2/2] Apply suggestion from @msimberg --- checks/prgenv/uenv_fixincludes.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/prgenv/uenv_fixincludes.py b/checks/prgenv/uenv_fixincludes.py index a59d0b01c..6379886a1 100644 --- a/checks/prgenv/uenv_fixincludes.py +++ b/checks/prgenv/uenv_fixincludes.py @@ -10,8 +10,8 @@ @rfm.xfail( "ICON uenvs are based on old versions of spack that don't fix GCC's includes", lambda self: ( - self.current_environ.name.startswith("icon_25_2_v4") - or self.current_environ.name.startswith("icon-dsl_25_12_v2") + self.current_environ.name.startswith("icon_25.2_v4") + or self.current_environ.name.startswith("icon-dsl_25.12_v2") ), ) # noqa:E501 @rfm.simple_test