Commit b790b7f9 authored by Andreas Klebinger's avatar Andreas Klebinger Committed by Marge Bot
Browse files

Testsuite: Support for user supplied package dbs

We can now supply additional package dbs to the testsuite.
For make the package db can be supplied by
passing PACKAGE_DB=/path/to/db.

In the testsuite driver it's passed via the --test-package-db
argument.
parent bb100805
Pipeline #27166 failed with stages
in 347 minutes and 4 seconds
......@@ -73,6 +73,7 @@ parser.add_argument("--junit", type=argparse.FileType('wb'), help="output testsu
parser.add_argument("--broken-test", action="append", default=[], help="a test name to mark as broken for this run")
parser.add_argument("--test-env", default='local', help="Override default chosen test-env.")
parser.add_argument("--perf-baseline", type=GitRef, metavar='COMMIT', help="Baseline commit for performance comparsons.")
parser.add_argument("--test-package-db", dest="test_package_db", action="append", help="Package db providing optional packages used by the testsuite.")
perf_group.add_argument("--skip-perf-tests", action="store_true", help="skip performance tests")
perf_group.add_argument("--only-perf-tests", action="store_true", help="Only do performance tests")
......@@ -109,6 +110,9 @@ config.baseline_commit = args.perf_baseline
if args.top:
config.top = args.top
if args.test_package_db:
config.test_package_db = args.test_package_db
if args.only:
config.only = args.only
config.run_only_some_tests = True
......
......@@ -169,6 +169,9 @@ class TestConfig:
# Baseline commit for performane metric comparisons.
self.baseline_commit = None # type: Optional[GitRef]
# Additional package dbs to inspect for test dependencies.
self.test_package_db = [] # type: [PathToPackageDb]
# Should we skip performance tests
self.skip_perf_tests = False
......
......@@ -165,7 +165,16 @@ def have_library(lib: str) -> bool:
got_it = have_lib_cache[lib]
else:
cmd = strip_quotes(config.ghc_pkg)
p = subprocess.Popen([cmd, '--no-user-package-db', 'describe', lib],
cmd_line = [cmd, '--no-user-package-db']
for db in config.test_package_db:
cmd_line.append("--package-db="+db)
cmd_line.extend(['describe', lib])
print(cmd_line)
p = subprocess.Popen(cmd_line,
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
env=ghc_env)
......@@ -181,6 +190,10 @@ def have_library(lib: str) -> bool:
def _reqlib( name, opts, lib ):
if not have_library(lib):
opts.expect = 'missing-lib'
else:
opts.extra_hc_opts = opts.extra_hc_opts + ' -package ' + lib + ' '
for db in config.test_package_db:
opts.extra_hc_opts = opts.extra_hc_opts + ' -package-db=' + db + ' '
def req_haddock( name, opts ):
if not config.haddock:
......
......@@ -216,6 +216,10 @@ ifneq "$(THREADS)" ""
RUNTEST_OPTS += --threads=$(THREADS)
endif
ifneq "$(PACKAGE_DB)" ""
RUNTEST_OPTS += --test-package-db=$(PACKAGE_DB)
endif
ifneq "$(VERBOSE)" ""
RUNTEST_OPTS += --verbose=$(VERBOSE)
endif
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment