Fix version regex for dumpbin

Mark cmake tests as requiring C & C++ Restore version flags for gcc linker
cropsinsilico · Jun 25, 2024 · b147c1e · b147c1e
1 parent 08c4db8
commit b147c1e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/tests/drivers/test_CMakeModelDriver.py b/tests/drivers/test_CMakeModelDriver.py
@@ -86,6 +86,8 @@ def test_CMakeModelDriver_error_nofile():
     assert not os.path.isfile(buildfile)
 
 
+@pytest.mark.language('c')
+@pytest.mark.language('c++')
 class TestCMakeModelDriver(base_class):
     r"""Test runner for CMakeModelDriver."""
 

diff --git a/yggdrasil/drivers/CModelDriver.py b/yggdrasil/drivers/CModelDriver.py
@@ -287,9 +287,9 @@ class GCCLinker(LDLinker):
     default_executable = GCCCompiler.default_executable
     toolset = GCCCompiler.toolset
     compatible_toolsets = GCCCompiler.compatible_toolsets
-    version_flags = ['-Xlinker', '-v']
+    version_flags = ['-Xlinker', '--verbose']
     version_regex = LDLinker.version_regex + GCCCompiler.version_regex
-    search_path_flags = ['-Xlinker', '-v']
+    search_path_flags = ['-Xlinker', '--verbose']
     search_regex = [r'SEARCH_DIR\("=([^"]+)"\);']
     flag_options = OrderedDict(LDLinker.flag_options,
                                **{'library_rpath': '-Wl,-rpath'})

diff --git a/yggdrasil/drivers/CompiledModelDriver.py b/yggdrasil/drivers/CompiledModelDriver.py
@@ -6254,7 +6254,8 @@ class DumpBinDisassembler(DisassemblerBase):
             'filters': ['DLL name']},
     }
     version_regex = [
-        r'Microsoft \(R\) COFF\/PE Dumper Version \d+\.\d+\.\d+\.\d+']
+        r'(?P<version>Microsoft \(R\) COFF\/PE Dumper Version '
+        r'\d+\.\d+\.\d+\.\d+)']
 
 
 class BuilderBase(CompilationToolBase):