summaryrefslogtreecommitdiff
path: root/testsuite/driver
diff options
context:
space:
mode:
authorPaolo Capriotti <p.capriotti@gmail.com>2012-05-04 13:05:01 +0100
committerPaolo Capriotti <p.capriotti@gmail.com>2012-05-15 08:29:30 +0100
commit24d70daed5082f1aa32424e12650e136ca404771 (patch)
treef0a9e84113a2bcc7942ec97f661243bbc92b5e30 /testsuite/driver
parent37a28207a5e30fb4737f77cd8d458f2b9090275f (diff)
downloadhaskell-24d70daed5082f1aa32424e12650e136ca404771.tar.gz
Rename package-conf flags to package-db.
Diffstat (limited to 'testsuite/driver')
-rw-r--r--testsuite/driver/testlib.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/testsuite/driver/testlib.py b/testsuite/driver/testlib.py
index fc9014d2a2..069f738f0c 100644
--- a/testsuite/driver/testlib.py
+++ b/testsuite/driver/testlib.py
@@ -97,7 +97,7 @@ def _reqlib( opts, lib ):
if have_subprocess:
# By preference we use subprocess, as the alternative uses
# /dev/null which mingw doesn't have.
- p = subprocess.Popen([config.ghc_pkg, '--no-user-package-conf', 'describe', lib],
+ p = subprocess.Popen([config.ghc_pkg, '--no-user-package-db', 'describe', lib],
stdout=subprocess.PIPE,
stderr=subprocess.PIPE)
# read from stdout and stderr to avoid blocking due to
@@ -1672,7 +1672,7 @@ def if_verbose_dump( n, f ):
# Guess flags suitable for the compiler.
def guess_compiler_flags():
if config.compiler_type == 'ghc':
- return ['-fforce-recomp', '-dcore-lint', '-no-user-package-conf']
+ return ['-fforce-recomp', '-dcore-lint', '-no-user-package-db']
elif config.compiler_type == 'nhc':
return ['-an-nhc-specific-flag']
else: