diff options
| author | Adam Gundry <adam@well-typed.com> | 2015-10-16 13:58:52 +0100 |
|---|---|---|
| committer | Adam Gundry <adam@well-typed.com> | 2015-10-16 13:58:52 +0100 |
| commit | 5a1b4f814f74ec1c48152d97523744518e212777 (patch) | |
| tree | 7c2207ecacbd37f12c78dbcf9d4334827164e0fb /testsuite/driver/runtests.py | |
| parent | 6757950cdd8bb0af0355539987ee78401a6a8f6b (diff) | |
| parent | 808bbdf08058785ae5bc59b5b4f2b04951d4cbbf (diff) | |
| download | haskell-wip/orf-reboot.tar.gz | |
Merge remote-tracking branch 'origin/master' into wip/orf-rebootwip/orf-reboot
Conflicts:
compiler/rename/RnNames.hs
compiler/typecheck/TcRnMonad.hs
utils/haddock
Diffstat (limited to 'testsuite/driver/runtests.py')
| -rw-r--r-- | testsuite/driver/runtests.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/testsuite/driver/runtests.py b/testsuite/driver/runtests.py index 5a0770d02f..efadb0310b 100644 --- a/testsuite/driver/runtests.py +++ b/testsuite/driver/runtests.py @@ -210,6 +210,9 @@ from testlib import * if windows or darwin: pkginfo = getStdout([config.ghc_pkg, 'dump']) topdir = config.libdir + if windows: + mingw = os.path.join(topdir, '../mingw/bin') + os.environ['PATH'] = os.pathsep.join([os.environ.get("PATH", ""), mingw]) for line in pkginfo.split('\n'): if line.startswith('library-dirs:'): path = line.rstrip() |