diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2022-04-19 11:54:04 -0400 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2022-04-22 02:16:35 -0400 |
| commit | 09e98859be5304176d5c66b4a71d61bf381bcae5 (patch) | |
| tree | 46b19b4bcbc5d82d1fe882a7ebfc9ee2b952a65a | |
| parent | dd5fecb0e2990b192d92f4dfd7519ecb33164fad (diff) | |
| download | haskell-09e98859be5304176d5c66b4a71d61bf381bcae5.tar.gz | |
testsuite: Ensure that GHC doesn't pick up environment files
Here we set GHC_ENVIRONMENT="-" to ensure that GHC invocations of tests
don't pick up a user's local package environment.
Fixes #21365.
Metric Decrease:
T10421
T12234
T12425
T13035
T16875
T9198
| -rw-r--r-- | testsuite/driver/runtests.py | 3 | ||||
| -rw-r--r-- | testsuite/driver/testglobals.py | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/testsuite/driver/runtests.py b/testsuite/driver/runtests.py index 0d458924d0..5510adfdef 100644 --- a/testsuite/driver/runtests.py +++ b/testsuite/driver/runtests.py @@ -42,6 +42,9 @@ import cpu_features os.environ['TERM'] = 'vt100' ghc_env['TERM'] = 'vt100' +# Ensure that GHC doesn't go looking for environment files. See #21365. +ghc_env['GHC_ENVIRONMENT'] = "-" + global config config = getConfig() # get it from testglobals config.validate() diff --git a/testsuite/driver/testglobals.py b/testsuite/driver/testglobals.py index b85a14e17a..8a68ffd33e 100644 --- a/testsuite/driver/testglobals.py +++ b/testsuite/driver/testglobals.py @@ -237,8 +237,7 @@ def getConfig(): return config import os -# Hold our modified GHC testrunning environment so we don't poison the current -# python's environment. +# This is the environment in which we run test subprocesses. global ghc_env ghc_env = os.environ.copy() |