From 2a5f4c04538d17d306b20675f9d847a3ee84dfd5 Mon Sep 17 00:00:00 2001 From: crivella Date: Wed, 19 Aug 2026 11:50:59 +0200 Subject: [PATCH 1/2] Add hook for LLVM 21.1.8 tests --- eb_hooks.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/eb_hooks.py b/eb_hooks.py index 3cd66af8..b8cdad53 100644 --- a/eb_hooks.py +++ b/eb_hooks.py @@ -1462,6 +1462,20 @@ def recursive_set_deps(item, softwares): item.deps.append(sftw) recursive_set_deps(self, softwares=('zlib', 'ncurses')) + + # More ignorable tests and patch to avoid treating `__unused` as a non-reserved name + # https://github.com/EESSI/software-layer/pull/1583 + if self.version == '21.1.8': + self.cfg.update('test_suite_ignore_patterns', 'Clang :: Driver/aarch64-toolchain-extra.c') + self.cfg.update('test_suite_ignore_patterns', 'Clang :: Driver/arm-toolchain-extra.c') + self.cfg.update('test_suite_ignore_patterns', 'libFuzzer-x86_64-default-Linux :: stack-overflow-with-asan.test') + self.cfg.update('test_suite_ignore_patterns', 'libFuzzer-x86_64-libcxx-Linux :: stack-overflow-with-asan.test') + self.cfg.update('test_suite_ignore_patterns', 'libFuzzer-x86_64-static-libcxx-Linux :: stack-overflow-with-asan.test') + + # libcxx/test/libcxx/system_reserved_names.gen.py + sys_res_names_file = os.path.join(self.start_dir, 'libcxx', 'test', 'libcxx', 'system_reserved_names.gen.py') + #define __unused SYSTEM_RESERVED_NAME + apply_regex_substitutions(sys_res_names_file, [(r'^#define __unused SYSTEM_RESERVED_NAME', '')]) else: raise EasyBuildError("LLVM-specific hook triggered for non-LLVM easyconfig?!") From 0e9ae0c7a3628f90131907dcd2c4790b63458b42 Mon Sep 17 00:00:00 2001 From: crivella Date: Wed, 19 Aug 2026 11:52:19 +0200 Subject: [PATCH 2/2] Remove unneeded comments --- eb_hooks.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/eb_hooks.py b/eb_hooks.py index b8cdad53..fe5a3bd9 100644 --- a/eb_hooks.py +++ b/eb_hooks.py @@ -1472,9 +1472,7 @@ def recursive_set_deps(item, softwares): self.cfg.update('test_suite_ignore_patterns', 'libFuzzer-x86_64-libcxx-Linux :: stack-overflow-with-asan.test') self.cfg.update('test_suite_ignore_patterns', 'libFuzzer-x86_64-static-libcxx-Linux :: stack-overflow-with-asan.test') - # libcxx/test/libcxx/system_reserved_names.gen.py sys_res_names_file = os.path.join(self.start_dir, 'libcxx', 'test', 'libcxx', 'system_reserved_names.gen.py') - #define __unused SYSTEM_RESERVED_NAME apply_regex_substitutions(sys_res_names_file, [(r'^#define __unused SYSTEM_RESERVED_NAME', '')]) else: raise EasyBuildError("LLVM-specific hook triggered for non-LLVM easyconfig?!")