Commit 156cd39f authored by dreixel's avatar dreixel
Browse files

Merge branch 'master' of http://darcs.haskell.org/testsuite

parents 69cc9a59 49f18748
......@@ -24,7 +24,7 @@ cabal01:
'$(TEST_HC)' --make -o setup Setup.lhs -v0
'$(GHC_PKG)' init local.db
./setup configure -v0 --prefix=$(PREFIX) --with-compiler='$(TEST_HC)' --with-hc-pkg='$(GHC_PKG)' --package-db=local.db $(PROF)
./setup configure -v0 --prefix=$(PREFIX) --with-compiler='$(TEST_HC)' --ghc-options='$(TEST_HC_OPTS)' --with-hc-pkg='$(GHC_PKG)' --package-db=local.db $(PROF)
./setup build -v0
./setup copy -v0
echo install1:
......
......@@ -4,7 +4,7 @@ include $(TOP)/mk/test.mk
CABAL_SETUP = $(FPTOOLS_TOP_ABS)/libraries/Cabal/cabal-setup/cabal-setup
CONFIG_ARGS = --with-compiler=$(TEST_HC) --with-hc-pkg=$(GHC_PKG)
CONFIG_ARGS = --with-compiler=$(TEST_HC) --ghc-options='$(TEST_HC_OPTS)' --with-hc-pkg=$(GHC_PKG)
# We have 3 packages, P-1.0, P-2.0, and Q. Q depends on P-1.0.
# We have an executable R, that depends on P-2.0 and Q, so the resulting
......
......@@ -20,17 +20,17 @@ cabal03: clean
'$(GHC_PKG)' init tmp.d
'$(TEST_HC)' -v0 --make Setup
cd p && $(SETUP) clean
cd p && $(SETUP) configure --with-ghc='$(TEST_HC)' --package-db=../tmp.d --disable-optimisation --ghc-pkg-option=--force
cd p && $(SETUP) configure --with-ghc='$(TEST_HC)' --ghc-options='$(TEST_HC_OPTS)' --package-db=../tmp.d --disable-optimisation --ghc-pkg-option=--force
cd p && $(SETUP) build
cd p && $(SETUP) register
cd q && $(SETUP) configure --with-ghc='$(TEST_HC)' --package-db=../tmp.d --ghc-pkg-option=--force
cd q && $(SETUP) configure --with-ghc='$(TEST_HC)' --ghc-options='$(TEST_HC_OPTS)' --package-db=../tmp.d --ghc-pkg-option=--force
cd q && $(SETUP) build
cd q && $(SETUP) register
cd p && $(SETUP) clean
cd p && $(SETUP) configure --with-ghc='$(TEST_HC)' --package-db=../tmp.d --ghc-pkg-option=--force
cd p && $(SETUP) configure --with-ghc='$(TEST_HC)' --ghc-options='$(TEST_HC_OPTS)' --package-db=../tmp.d --ghc-pkg-option=--force
cd p && $(SETUP) build
cd p && $(SETUP) register
cd r && ! ../Setup configure --with-ghc='$(TEST_HC)' --package-db=../tmp.d --ghc-pkg-option=--force
cd r && ! ../Setup configure --with-ghc='$(TEST_HC)' --ghc-options='$(TEST_HC_OPTS)' --package-db=../tmp.d --ghc-pkg-option=--force
ifneq "$(CLEANUP)" ""
$(MAKE) clean
endif
......
......@@ -11,7 +11,7 @@ cabal04:
$(MAKE) clean
'$(TEST_HC)' -v0 --make Setup
$(SETUP) clean
$(SETUP) configure --with-ghc='$(TEST_HC)' $(PROF) $(DYN)
$(SETUP) configure --with-ghc='$(TEST_HC)' --ghc-options='$(TEST_HC_OPTS)' $(PROF) $(DYN)
$(SETUP) build 2> err
! grep -v "Creating library file" err
ifneq "$(CLEANUP)" ""
......
<no location info>:
Warning: -O conflicts with --interactive; -O ignored.
......@@ -19,6 +19,8 @@ LOCAL_PKGCONF=local.package.conf
LOCAL_GHC_PKG = '$(GHC_PKG)' --no-user-package-conf -f $(LOCAL_PKGCONF)
rn.prog006:
rm -f A.hi A.o B/C.hi B/C.o Main.hi Main.o pkg.conf
rm -f pwd pwd.exe pwd.exe.manifest pwd.hi pwd.o
'$(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
......
Markdown is supported
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