From 032ab2651337d6456ba84ae9e7f92b670001c46d Mon Sep 17 00:00:00 2001 From: Joerg Henrichs Date: Fri, 22 Nov 2024 00:42:48 +1100 Subject: [PATCH] Fixed failing tests. --- tests/unit_tests/tools/test_compiler.py | 13 +++++++------ tests/unit_tests/tools/test_tool_repository.py | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/tests/unit_tests/tools/test_compiler.py b/tests/unit_tests/tools/test_compiler.py index 70c16da0..f6c7c158 100644 --- a/tests/unit_tests/tools/test_compiler.py +++ b/tests/unit_tests/tools/test_compiler.py @@ -47,26 +47,27 @@ def test_compiler(): def test_compiler_openmp(): '''Test that the openmp flag is correctly reflected in the test if a compiler supports OpenMP or not.''' - cc = CCompiler("gcc", "gcc", "gnu", openmp_flag="-fopenmp") + cc = CCompiler("gcc", "gcc", "gnu", openmp_flag="-fopenmp", + version_regex=None) assert cc.openmp_flag == "-fopenmp" assert cc.openmp - cc = CCompiler("gcc", "gcc", "gnu", openmp_flag=None) + cc = CCompiler("gcc", "gcc", "gnu", openmp_flag=None, version_regex=None) assert cc.openmp_flag == "" assert not cc.openmp - cc = CCompiler("gcc", "gcc", "gnu") + cc = CCompiler("gcc", "gcc", "gnu", version_regex=None) assert cc.openmp_flag == "" assert not cc.openmp fc = FortranCompiler("gfortran", "gfortran", "gnu", openmp_flag="-fopenmp", - module_folder_flag="-J") + module_folder_flag="-J", version_regex=None) assert fc.openmp_flag == "-fopenmp" assert fc.openmp fc = FortranCompiler("gfortran", "gfortran", "gnu", openmp_flag=None, - module_folder_flag="-J") + module_folder_flag="-J", version_regex=None) assert fc.openmp_flag == "" assert not fc.openmp fc = FortranCompiler("gfortran", "gfortran", "gnu", - module_folder_flag="-J") + module_folder_flag="-J", version_regex=None) assert fc.openmp_flag == "" assert not fc.openmp diff --git a/tests/unit_tests/tools/test_tool_repository.py b/tests/unit_tests/tools/test_tool_repository.py index 8369668e..e9bfb0c1 100644 --- a/tests/unit_tests/tools/test_tool_repository.py +++ b/tests/unit_tests/tools/test_tool_repository.py @@ -137,7 +137,7 @@ def test_tool_repository_get_default_error_missing_openmp_compiler(): ToolRepository.''' tr = ToolRepository() fc = FortranCompiler("gfortran", "gfortran", "gnu", openmp_flag=None, - module_folder_flag="-J") + module_folder_flag="-J", version_regex=None) with mock.patch.dict(tr, {Category.FORTRAN_COMPILER: [fc]}), \ pytest.raises(RuntimeError) as err: