[commit: testsuite] ghc-7.6: Fix a couple of tests when dynlibs-by-default is on (b3797ce)
Ian Lynagh <[email protected]>
| Newsgroups | gmane.comp.lang.haskell.cvs.ghc |
|---|---|
| Message-ID | <[email protected]> |
Repository : ssh://darcs.haskell.org//srv/darcs/testsuite On branch : ghc-7.6 http://hackage.haskell.org/trac/ghc/changeset/b3797ce26f3a628aa899712105f61af0d6f538bb >--------------------------------------------------------------- commit b3797ce26f3a628aa899712105f61af0d6f538bb Author: Ian Lynagh <[email protected]> Date: Thu Oct 4 10:06:19 2012 +0100 Fix a couple of tests when dynlibs-by-default is on >--------------------------------------------------------------- tests/cabal/cabal01/Makefile | 6 +++++- tests/safeHaskell/check/pkg01/Makefile | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/tests/cabal/cabal01/Makefile b/tests/cabal/cabal01/Makefile index 5217d89..b88756a 100644 --- a/tests/cabal/cabal01/Makefile +++ b/tests/cabal/cabal01/Makefile @@ -24,7 +24,11 @@ cabal01: '$(TEST_HC)' --make -o setup Setup.lhs -v0 '$(GHC_PKG)' init local.db - ./setup configure -v0 --prefix=$(PREFIX) --with-compiler='$(TEST_HC)' --ghc-options='$(TEST_HC_OPTS)' --with-hc-pkg='$(GHC_PKG)' --package-db=local.db $(PROF) +# We don't make use of -rtsopts in this test, and if it's enabled then +# we get a warning if dynlibs are enabled by default that: +# Warning: -rtsopts and -with-rtsopts have no effect with -shared. +# so we filter the flag out + ./setup configure -v0 --prefix=$(PREFIX) --with-compiler='$(TEST_HC)' --ghc-options='$(filter-out -rtsopts,$(TEST_HC_OPTS))' --with-hc-pkg='$(GHC_PKG)' --package-db=local.db $(PROF) ./setup build -v0 ./setup copy -v0 echo install1: diff --git a/tests/safeHaskell/check/pkg01/Makefile b/tests/safeHaskell/check/pkg01/Makefile index ac5bfd9..ee5d003 100644 --- a/tests/safeHaskell/check/pkg01/Makefile +++ b/tests/safeHaskell/check/pkg01/Makefile @@ -25,7 +25,11 @@ safePkg01: '$(TEST_HC)' --make -o setup Setup.hs -v0 '$(GHC_PKG)' init local.db - ./setup configure -v0 --prefix='$(PREFIX)' --with-compiler='$(TEST_HC)' --ghc-options='$(TEST_HC_OPTS) -fpackage-trust -trust base -trust bytestring' --with-hc-pkg='$(GHC_PKG)' --package-db='$(PKGCONF)' $(PROF) +# We don't make use of -rtsopts in this test, and if it's enabled then +# we get a warning if dynlibs are enabled by default that: +# Warning: -rtsopts and -with-rtsopts have no effect with -shared. +# so we filter the flag out + ./setup configure -v0 --prefix='$(PREFIX)' --with-compiler='$(TEST_HC)' --ghc-options='$(filter-out -rtsopts,$(TEST_HC_OPTS)) -fpackage-trust -trust base -trust bytestring' --with-hc-pkg='$(GHC_PKG)' --package-db='$(PKGCONF)' $(PROF) ./setup build -v0 ./setup copy -v0 ./setup register --inplace -v0