diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2021-04-02 15:04:53 -0400 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2021-04-02 15:04:53 -0400 |
| commit | 78d24d55422a1545ada0a0050aaf43365108781b (patch) | |
| tree | e8c5493edf120d831ceb1db5e0977193c1ac6f73 /testsuite/driver/runtests.py | |
| parent | ce706faeef3964116c6e1dd0e6ae2f2e77fde57d (diff) | |
| download | haskell-wip/T19640.tar.gz | |
Revert "[ci/arm/darwin/testsuite] Forwards ports from GHC-8.10"wip/T19640
This reverts commit 0cbdba2768d84a0f6832ae5cf9ea1e98efd739da.
Diffstat (limited to 'testsuite/driver/runtests.py')
| -rw-r--r-- | testsuite/driver/runtests.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/testsuite/driver/runtests.py b/testsuite/driver/runtests.py index ac0d4f7100..d4425b5da5 100644 --- a/testsuite/driver/runtests.py +++ b/testsuite/driver/runtests.py @@ -266,7 +266,7 @@ def format_path(path): # On Windows we need to set $PATH to include the paths to all the DLLs # in order for the dynamic library tests to work. -if windows: +if windows or darwin: pkginfo = getStdout([config.ghc_pkg, 'dump']) topdir = config.libdir if windows: @@ -284,9 +284,12 @@ if windows: if path.startswith('"'): path = re.sub('^"(.*)"$', '\\1', path) path = re.sub('\\\\(.)', '\\1', path) - + if windows: path = format_path(path) ghc_env['PATH'] = os.pathsep.join([path, ghc_env.get("PATH", "")]) + else: + # darwin + ghc_env['DYLD_LIBRARY_PATH'] = os.pathsep.join([path, ghc_env.get("DYLD_LIBRARY_PATH", "")]) testopts_local.x = TestOptions() |