[commit: ghc] master: Extend windows detection in testsuite to recognize MSYS target (034b203)
git at git.haskell.org
git at git.haskell.org
Sat Oct 11 10:32:10 UTC 2014
Repository : ssh://git@git.haskell.org/ghc
On branch : master
Link : http://ghc.haskell.org/trac/ghc/changeset/034b2035d6099c8a253bb1fbd1864001a27b44d6/ghc
>---------------------------------------------------------------
commit 034b2035d6099c8a253bb1fbd1864001a27b44d6
Author: Gintautas Miliauskas <gintautas.miliauskas at gmail.com>
Date: Wed Sep 17 20:57:39 2014 +0200
Extend windows detection in testsuite to recognize MSYS target
Currently, the detection recognizes the following `uname -s` strings:
- `CYGWIN_NT-6.3`
- `MINGW32_NT-6.3`
- `MINGW64_NT_6.3`
However, MSYS2 provides an additional target, in which case `uname -s`
returns a string such as `MSYS_NT-6.3`. In all these cases, the system
ought to be recognized as being a `windows` os by the testsuite runner.
See also #9604
>---------------------------------------------------------------
034b2035d6099c8a253bb1fbd1864001a27b44d6
testsuite/driver/runtests.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/testsuite/driver/runtests.py b/testsuite/driver/runtests.py
index cc55dad..571165a 100644
--- a/testsuite/driver/runtests.py
+++ b/testsuite/driver/runtests.py
@@ -139,9 +139,9 @@ if windows:
h.close()
if v.startswith("CYGWIN"):
config.cygwin = True
- elif v.startswith("MINGW"):
+ elif v.startswith("MINGW") or v.startswith("MSYS"):
# msys gives "MINGW32"
-# msys2 gives "MINGW_NT-6.2"
+# msys2 gives "MINGW_NT-6.2" or "MSYS_NT-6.3"
config.msys = True
else:
raise Exception("Can't detect Windows terminal type")
More information about the ghc-commits
mailing list