[Git][ghc/ghc][wip/js-staging] Testsuite: better normalisation of .jsexe extension

Sylvain Henry (@hsyl20) gitlab at gitlab.haskell.org
Mon Sep 26 21:30:39 UTC 2022



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


Commits:
23c4c228 by Sylvain Henry at 2022-09-26T23:33:47+02:00
Testsuite: better normalisation of .jsexe extension

- - - - -


1 changed file:

- testsuite/driver/testlib.py


Changes:

=====================================
testsuite/driver/testlib.py
=====================================
@@ -2425,6 +2425,7 @@ def normalise_slashes_( s: str ) -> str:
 
 def normalise_exe_( s: str ) -> str:
     s = re.sub('\.exe', '', s)
+    s = re.sub('\.jsexe', '', s)
     return s
 
 def normalise_output( s: str ) -> str:
@@ -2433,8 +2434,10 @@ def normalise_output( s: str ) -> str:
     s = modify_lines(s, lambda l: re.sub(' error:', '', l))
     s = modify_lines(s, lambda l: re.sub(' Warning:', ' warning:', l))
     # Remove a .exe extension (for Windows)
+    # and .jsexe extension (for the JS backend)
     # This can occur in error messages generated by the program.
     s = re.sub('([^\\s])\\.exe', '\\1', s)
+    s = re.sub('([^\\s])\\.jsexe', '\\1', s)
     s = normalise_callstacks(s)
     s = normalise_type_reps(s)
     # ghci outputs are pretty unstable with -fexternal-dynamic-refs, which is



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

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/23c4c22834e5952a90294d7aefa074a422cc4ad7
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/20220926/b4383145/attachment-0001.html>


More information about the ghc-commits mailing list