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/tests/ghc-regress/rename/prog006 | |
| 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/tests/ghc-regress/rename/prog006')
| -rw-r--r-- | testsuite/tests/ghc-regress/rename/prog006/Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/testsuite/tests/ghc-regress/rename/prog006/Makefile b/testsuite/tests/ghc-regress/rename/prog006/Makefile index 9ceaa39737..765779b1eb 100644 --- a/testsuite/tests/ghc-regress/rename/prog006/Makefile +++ b/testsuite/tests/ghc-regress/rename/prog006/Makefile @@ -19,8 +19,8 @@ LOCAL_PKGCONF=local.package.conf LOCAL_GHC_PKG = '$(GHC_PKG)' --no-user-package-conf -f $(LOCAL_PKGCONF) rn.prog006: - '$(TEST_HC)' --make pwd -v0 - '$(TEST_HC)' --make -package-name test-1.0 B.C -fforce-recomp -v0 + '$(TEST_HC)' $(TEST_HC_OPTS) --make pwd -v0 + '$(TEST_HC)' $(TEST_HC_OPTS) --make -package-name test-1.0 B.C -fforce-recomp -v0 rm -f pkg.conf echo "name: test" >>pkg.conf echo "version: 1.0" >>pkg.conf @@ -29,9 +29,9 @@ rn.prog006: echo "exposed-modules: B.C" >>pkg.conf echo "[]" >$(LOCAL_PKGCONF) $(LOCAL_GHC_PKG) register pkg.conf -v0 - '$(TEST_HC)' -c -package-conf $(LOCAL_PKGCONF) -package test -fforce-recomp A.hs -i + '$(TEST_HC)' $(TEST_HC_OPTS) -c -package-conf $(LOCAL_PKGCONF) -package test -fforce-recomp A.hs -i # The -i clears the search path, so A.hs will find B.C from package test - -'$(TEST_HC)' -c -package-conf $(LOCAL_PKGCONF) -package test -fforce-recomp Main.hs + -'$(TEST_HC)' $(TEST_HC_OPTS) -c -package-conf $(LOCAL_PKGCONF) -package test -fforce-recomp Main.hs # No -i when compiling Main, so a from-scratch search would find a home-pkg module B.C # However, A.hi remembers that B.C came from package test, so all is ok. |