From 4ce2f7d6e6a516173750b1d740f345e90992ffce Mon Sep 17 00:00:00 2001 From: GHC GitLab CI Date: Fri, 26 Jun 2020 17:22:15 +0000 Subject: testsuite: Add --top flag to driver This allows us to make `config.top` a proper Path. Previously it was a str, which caused the Ghostscript detection logic to break. --- testsuite/mk/test.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'testsuite/mk') diff --git a/testsuite/mk/test.mk b/testsuite/mk/test.mk index 49c0062eed..64c8550ce7 100644 --- a/testsuite/mk/test.mk +++ b/testsuite/mk/test.mk @@ -256,13 +256,13 @@ endif RUNTEST_OPTS += \ --rootdir=. \ --config-file=$(CONFIG) \ + --top="$(TOP_ABS)" \ -e 'config.platform="$(TARGETPLATFORM)"' \ -e 'config.os="$(TargetOS_CPP)"' \ -e 'config.arch="$(TargetARCH_CPP)"' \ -e 'config.wordsize="$(WORDSIZE)"' \ -e 'config.timeout=int($(TIMEOUT)) or config.timeout' \ - -e 'config.exeext="$(exeext)"' \ - -e 'config.top="$(TOP_ABS)"' + -e 'config.exeext="$(exeext)"' # Wrap non-empty program paths in quotes, because they may contain spaces. Do # it here, so we don't have to (and don't forget to do it) in the .T test -- cgit v1.2.1