Skip to content

Commit a76c78d

Browse files
committed
move the reset of the ignore_test_failure to post_easyblock_hook
1 parent e80b897 commit a76c78d

1 file changed

Lines changed: 4 additions & 8 deletions

File tree

eb_hooks.py

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1588,14 +1588,6 @@ def pre_test_hook_ignore_failing_tests_LAMMPS_ARM_generic(self, *args, **kwargs)
15881588
update_build_option('ignore_test_failure', True)
15891589

15901590

1591-
def post_test_hook(self, *args, **kwargs):
1592-
"""
1593-
If self.orig_ignore_test_failure exists reset ignore_test_failure to its original value.
1594-
"""
1595-
if hasattr(self, "orig_ignore_test_failure") and self.orig_ignore_test_failure != build_option('ignore_test_failure'):
1596-
update_build_option('ignore_test_failure', self.orig_ignore_test_failure)
1597-
1598-
15991591
def pre_single_extension_hook(ext, *args, **kwargs):
16001592
"""Main pre-extension: trigger custom functions based on software name."""
16011593
if ext.name in PRE_SINGLE_EXTENSION_HOOKS:
@@ -1943,6 +1935,10 @@ def post_easyblock_hook(self, *args, **kwargs):
19431935
post_easyblock_hook_copy_easybuild_subdir(self, *args, **kwargs)
19441936
else:
19451937
self.log.debug("No CVMFS/site installation requested, not running post_easyblock_hook_copy_easybuild_subdir.")
1938+
1939+
# If self.orig_ignore_test_failure is set return it to its original value.
1940+
if hasattr(self, "orig_ignore_test_failure") and self.orig_ignore_test_failure != build_option('ignore_test_failure'):
1941+
update_build_option('ignore_test_failure', self.orig_ignore_test_failure)
19461942
else:
19471943
print_warning(f"Not enabling the post_easybuild_hook, as it requires EasyBuild 5.1.1 or newer (you are using {EASYBUILD_VERSION}).")
19481944

0 commit comments

Comments
 (0)