diff options
| author | Simon Peyton Jones <simonpj@microsoft.com> | 2011-04-20 17:39:11 +0100 |
|---|---|---|
| committer | Simon Peyton Jones <simonpj@microsoft.com> | 2011-04-20 17:39:11 +0100 |
| commit | 6c32ee85bb4c5f6052f66617f2acadab69189fc2 (patch) | |
| tree | 8a67679b1e12ea313205b43884b4cf4386777ee9 /testsuite/mk | |
| parent | 16fb7aebe43a55c515c5c89bf58dd12fd323b21f (diff) | |
| download | haskell-6c32ee85bb4c5f6052f66617f2acadab69189fc2.tar.gz | |
Add TEST_HC_OPTS to every Makefile invocation of TEST_HC
In the testsuite there are numerous Makefiles that invoke $(TEST_HC).
But, unlike the tests invoked directly by the harness, they didn't pass
-dno-debug-output, or $(EXTRA_HC_OPTS).
This patch goes part-way towards the goal of making the two consistent:
* Almost all invocations in the Makefiles now go
'$(TEST_HC)' $(TEST_HC_OPTS)
* In test.mk we initialise
TEST_HC_OPTS = -dno-debug-output $(EXTRA_HC_OPTS)
Still to come (I don't know how to do these)
* The invocations of TEST_HC via cabal are not treated
(eg cabal01, cabal04), and they should be
* TEST_HC_OPTS should probably be initialised the same way
as the Python script computes the flags to pass to the
TEST_HC that it calls directly
Diffstat (limited to 'testsuite/mk')
| -rw-r--r-- | testsuite/mk/test.mk | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/testsuite/mk/test.mk b/testsuite/mk/test.mk index 1d89c775e6..5a83f8e94d 100644 --- a/testsuite/mk/test.mk +++ b/testsuite/mk/test.mk @@ -25,6 +25,10 @@ COMPILER = ghc CONFIGDIR = $(TOP)/config CONFIG = $(CONFIGDIR)/$(COMPILER) +# TEST_HC_OPTS is passed to every invocation of TEST_HC +# in nested Makefiles +TEST_HC_OPTS = -dno-debug-output $(EXTRA_HC_OPTS) + RUNTEST_OPTS = $(eval $(call get-ghc-rts-field,WORDSIZE,Word size)) |