diff options
| author | Austin Seipp <austin@well-typed.com> | 2014-09-01 15:14:18 -0500 |
|---|---|---|
| committer | Austin Seipp <austin@well-typed.com> | 2014-09-01 15:14:18 -0500 |
| commit | 9711f78f790d10d914e08851544c6fc96f9a030a (patch) | |
| tree | 5c0153f04cb153257a96f71c45aa1cf865cc8128 /testsuite/driver | |
| parent | 918719b936b878ab660f20ceef8afc9e3a898c5a (diff) | |
| download | haskell-9711f78f790d10d914e08851544c6fc96f9a030a.tar.gz | |
Fix a couple test failures encountered when building on Windows
Summary:
* Adjusts performance tests
* Change ghcpkg05.stderr-mingw32 to match ghcpkg05.stderr
Test Plan: Ran 'sh validate' and observed fewer test failures afterwards
Reviewers: austin
Reviewed By: austin
Differential Revision: https://phabricator.haskell.org/D191
Diffstat (limited to 'testsuite/driver')
| -rw-r--r-- | testsuite/driver/runtests.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/testsuite/driver/runtests.py b/testsuite/driver/runtests.py index 103c7ace7c..52b5471362 100644 --- a/testsuite/driver/runtests.py +++ b/testsuite/driver/runtests.py @@ -143,8 +143,11 @@ if windows: # msys gives "MINGW32" # msys2 gives "MINGW_NT-6.2" config.msys = True +# msys2 gives 'MSYS_NT-6.3' unless you set MSYSTEM, which is also needed elsewhere + elif v.startswith("MSYS"): + raise Exception("Remember to set your MSYSTEM environment variable to MINGW32 or MINGW64") else: - raise Exception("Can't detect Windows terminal type") + raise Exception("Can't detect Windows terminal type: " + v) # Try to use UTF8 if windows: |