summaryrefslogtreecommitdiff
path: root/testsuite/driver/testglobals.py
diff options
context:
space:
mode:
authorTamar Christina <tamar@zhox.com>2018-01-02 16:00:57 -0500
committerBen Gamari <ben@smart-cactus.org>2018-01-02 17:33:04 -0500
commit27b7b4db9af99aeb88dce7ef0e85131199bbf2ff (patch)
treedb4d5bbc750857ce55d7bcc09962002e4ba176d3 /testsuite/driver/testglobals.py
parent4887c3086149a15a1e16c765682debcfbb9de145 (diff)
downloadhaskell-27b7b4db9af99aeb88dce7ef0e85131199bbf2ff.tar.gz
Windows: fix all failing tests.
This makes the testsuite pass clean on Windows again. It also fixes the `libstdc++-6.dll` error harbormaster was showing. I'm marking some tests as isolated tests to reduce their flakiness (mostly concurrency tests) when the test system is under heavy load. Updates process submodule. Test Plan: ./validate Reviewers: hvr, bgamari, erikd, simonmar Reviewed By: bgamari Subscribers: rwbarton, thomie, carter Differential Revision: https://phabricator.haskell.org/D4277
Diffstat (limited to 'testsuite/driver/testglobals.py')
-rw-r--r--testsuite/driver/testglobals.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/testsuite/driver/testglobals.py b/testsuite/driver/testglobals.py
index 5e7142d9c8..44fe125dc5 100644
--- a/testsuite/driver/testglobals.py
+++ b/testsuite/driver/testglobals.py
@@ -123,6 +123,12 @@ config = TestConfig()
def getConfig():
return config
+import os
+# Hold our modified GHC testrunning environment so we don't poison the current
+# python's environment.
+global ghc_env
+ghc_env = os.environ.copy()
+
# -----------------------------------------------------------------------------
# Information about the current test run