From 538c1daa5e0b9d35c9fa71a6fa25db0e5be3c0b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Mon, 6 Jan 2025 09:23:31 +0100 Subject: [PATCH 1/2] always check for ld.bfd, only check for ld.gold for version 2023.06 --- test/compat_layer.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/compat_layer.py b/test/compat_layer.py index 6ebc249..59a4cde 100644 --- a/test/compat_layer.py +++ b/test/compat_layer.py @@ -63,11 +63,13 @@ def __init__(self): @rfm.simple_test class ToolsAvailableTest(RunInGentooPrefixTest): - tool = parameter(['archspec', 'emerge', 'equery', 'ld.gold', 'make', 'patch', 'patchelf']) + tool = parameter(['archspec', 'emerge', 'equery', 'ld.bfd', 'ld.gold', 'make', 'patch', 'patchelf']) def __init__(self): # patchelf is only installed since 2021.06 compat layer self.skip_if(self.tool == 'patchelf' and self.eessi_version == '2021.03') + # 2023.06 still had both ld.bfd and ld.gold, but the latter will not be included in future versions + self.skip_if(self.tool == 'ld.gold' and self.eessi_version != '2023.06') super().__init__() self.descr = 'Verify that some required tools are available' self.command = f'which {self.tool}' From fef35a2537588f4626643df2d2d88293687f6b7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Mon, 6 Jan 2025 09:25:02 +0100 Subject: [PATCH 2/2] add test that runs pip check --- test/compat_layer.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/test/compat_layer.py b/test/compat_layer.py index 59a4cde..83d32c9 100644 --- a/test/compat_layer.py +++ b/test/compat_layer.py @@ -233,3 +233,15 @@ def __init__(self): f'user-defined-trusted-dirs={trusted_dir}', self.stdout ) + + +@rfm.simple_test +class PipCheckTest(RunInGentooPrefixTest): + def __init__(self): + super().__init__() + self.descr = 'Verify that "pip check" does not return any errors.' + self.command = 'pip check' + self.sanity_patterns = sn.all([ + sn.assert_eq(self.exit_code, 0), + sn.assert_found('\nNo broken requirements found.\n', self.stdout), + ])