Use correct shared library naming for Cygwin

Use correct shared library naming for Cygwin when building and installing

1 files changed, 14 insertions, 7 deletions

diff --git a/run_project_tests.py b/run_project_tests.py
index 28de638..a6cada3 100755
--- a/run_project_tests.py
+++ b/run_project_tests.py
@@ -31,6 +31,7 @@ import xml.etree.ElementTree as ET
 import time
 import multiprocessing
 import concurrent.futures as conc
+import re
 
 from mesonbuild.coredata import backendlist
 
@@ -208,12 +209,18 @@ def get_relative_files_list_from_dir(fromdir):
             paths.append(path)
     return paths
 
-def platform_fix_exe_name(fname):
-    if not fname.endswith('?exe'):
-        return fname
-    fname = fname[:-4]
-    if mesonlib.is_windows():
-        return fname + '.exe'
+def platform_fix_name(fname):
+    if '?lib' in fname:
+        if mesonlib.is_cygwin():
+            fname = re.sub(r'\?lib(.*)\.dll$', r'cyg\1.dll', fname)
+        else:
+            fname = re.sub(r'\?lib', 'lib', fname)
+
+    if fname.endswith('?exe'):
+        fname = fname[:-4]
+        if mesonlib.is_windows():
+            return fname + '.exe'
+
     return fname
 
 def validate_install(srcdir, installdir):
@@ -230,7 +237,7 @@ def validate_install(srcdir, installdir):
     elif os.path.exists(info_file):
         with open(info_file) as f:
             for line in f:
-                expected[platform_fix_exe_name(line.strip())] = False
+                expected[platform_fix_name(line.strip())] = False
     # Check if expected files were found
     for fname in expected:
         if os.path.exists(os.path.join(installdir, fname)):