[Git][ghc/ghc][wip/js-staging] Testsuite: fix normalisation for unlit

Sylvain Henry (@hsyl20) gitlab at gitlab.haskell.org
Mon Aug 29 15:12:29 UTC 2022



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


Commits:
c286e9e4 by Sylvain Henry at 2022-08-29T17:09:50+02:00
Testsuite: fix normalisation for unlit

T8430 shows:
  `js-unknown-ghcjs-unlit' failed in phase `Literate pre-processor'. (Exit code: 1)

Notice the quote around the program name. So I've made the regex match
more cases (i.e. not only lines starting with the program name).

- - - - -


1 changed file:

- testsuite/driver/testlib.py


Changes:

=====================================
testsuite/driver/testlib.py
=====================================
@@ -2313,7 +2313,7 @@ def normalise_errmsg(s: str) -> str:
     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)
-    s = re.sub('^\\w+-\\w+-\\w+-unlit', 'unlit', s)
+    s = re.sub('\\w+-\\w+-\\w+-unlit', 'unlit', 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/c286e9e4917e03cc8bca7e77b0e9f2a0aae550a8

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/c286e9e4917e03cc8bca7e77b0e9f2a0aae550a8
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/20220829/c5bb914b/attachment.html>


More information about the ghc-commits mailing list