[Git][ghc/ghc][wip/prof-dyn] testsuite: Make find_so regex more precise

Matthew Pickering (@mpickering) gitlab at gitlab.haskell.org
Tue Jul 9 09:04:17 UTC 2024



Matthew Pickering pushed to branch wip/prof-dyn at Glasgow Haskell Compiler / GHC


Commits:
625f5118 by Matthew Pickering at 2024-07-09T10:02:48+01:00
testsuite: Make find_so regex more precise

The hash contains lowercase [a-z0-9] and crucially not _p which meant we
sometimes matched on `libHS.._p` profiled shared libraries rather than
the normal shared library.

- - - - -


1 changed file:

- testsuite/driver/testlib.py


Changes:

=====================================
testsuite/driver/testlib.py
=====================================
@@ -727,7 +727,7 @@ def _find_so(lib, directory, in_place):
     # "\w+"         matches the hash on release builds or "inplace", such as 765d in the example
     # "ghc\S+"      matches the ghc build name: ghc9.11.20240508
     if in_place:
-        to_match = r'libHS{}-\d+(\.\d+)+-\w+-ghc\S+\.' + suffix
+        to_match = r'libHS{}-\d+(\.\d+)+-[a-z0-9]+-ghc\S+\.' + suffix
     else:
         to_match = r'libHS{}-\d+(\.\d+)+-ghc\S+\.' + suffix
 



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/625f5118725aa22d104235ffef696d92e62411e5

-- 
This project does not include diff previews in email notifications.
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/625f5118725aa22d104235ffef696d92e62411e5
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20240709/c192c4a8/attachment.html>


More information about the ghc-commits mailing list