[Git][ghc/ghc][wip/js-staging] Testsuite: normalise ghc program name

[Sylvain Henry (@hsyl20)]

Sylvain Henry pushed to branch wip/js-staging at Glasgow Haskell Compiler / GHC


Commits:
bc07b265 by Sylvain Henry at 2022-08-25T23:55:31+02:00
Testsuite: normalise ghc program name

- - - - -


1 changed file:

- testsuite/driver/testlib.py


Changes:

=====================================
testsuite/driver/testlib.py
=====================================
@@ -2309,6 +2309,8 @@ def normalise_errmsg(s: str) -> str:
     # The inplace ghc's are called ghc-stage[123] to avoid filename
     # collisions, so we need to normalise that to just "ghc"
     s = re.sub('ghc-stage[123]', 'ghc', s)
+    # Remove platform prefix (e.g. js-unknown-ghcjs) for cross-compiled ghc
+    s = re.sub('^\\w+-\\w+-\\w+-ghc', 'ghc', s)
 
     # On windows error messages can mention versioned executables
     s = re.sub('ghc-[0-9.]+', 'ghc', s)



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

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/bc07b26519b595217d966388efe969426329d0e1
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/20220825/3738b4d5/attachment-0001.html>