diff options
Diffstat (limited to 'testsuite/tests/cabal')
25 files changed, 122 insertions, 73 deletions
diff --git a/testsuite/tests/cabal/Makefile b/testsuite/tests/cabal/Makefile index 47cd95d010..7644bd8467 100644 --- a/testsuite/tests/cabal/Makefile +++ b/testsuite/tests/cabal/Makefile @@ -127,43 +127,51 @@ T1750: PKGCONFSHADOW1=localshadow1.package.conf PKGCONFSHADOW2=localshadow2.package.conf +PKGCONFSHADOW3=localshadow3.package.conf LOCAL_GHC_PKGSHADOW1 = '$(GHC_PKG)' --no-user-package-db -f $(PKGCONFSHADOW1) LOCAL_GHC_PKGSHADOW2 = '$(GHC_PKG)' --no-user-package-db -f $(PKGCONFSHADOW2) -LOCAL_GHC_PKGSHADOW3 = '$(GHC_PKG)' --no-user-package-db -f $(PKGCONFSHADOW1) -f $(PKGCONFSHADOW2) +LOCAL_GHC_PKGSHADOW3 = '$(GHC_PKG)' --no-user-package-db -f $(PKGCONFSHADOW3) +LOCAL_GHC_PKGSHADOW12 = '$(GHC_PKG)' --no-user-package-db -f $(PKGCONFSHADOW1) -f $(PKGCONFSHADOW2) +LOCAL_GHC_PKGSHADOW13 = '$(GHC_PKG)' --no-user-package-db -f $(PKGCONFSHADOW1) -f $(PKGCONFSHADOW3) # Test package shadowing behaviour. # # localshadow1.package.conf: shadowdep-1-XXX <- shadow-1-XXX -# localshadow2.package.conf: shadow-1-YYY -# -# shadow-1-XXX will be shadowed by shadow-1-YYY, thus invalidating -# shadowdep-1-XXX. +# localshadow2.package.conf: shadow-1-XXX +# +# If the ABI hash of boths shadow-1s are the same, we'll just accept +# the later shadow version. However, if the ABIs are different, we +# should complain! shadow: - rm -rf $(PKGCONFSHADOW1) $(PKGCONFSHADOW2) shadow.hs shadow.o shadow.hi shadow.out shadow.hs shadow.hi + rm -rf $(PKGCONFSHADOW1) $(PKGCONFSHADOW2) $(PKGCONFSHADOW3) shadow.hs shadow.o shadow.hi shadow.out shadow.hs shadow.hi $(LOCAL_GHC_PKGSHADOW1) init $(PKGCONFSHADOW1) $(LOCAL_GHC_PKGSHADOW2) init $(PKGCONFSHADOW2) + $(LOCAL_GHC_PKGSHADOW3) init $(PKGCONFSHADOW3) $(LOCAL_GHC_PKGSHADOW1) register -v0 --force shadow1.pkg $(LOCAL_GHC_PKGSHADOW1) register -v0 --force shadow2.pkg $(LOCAL_GHC_PKGSHADOW2) register -v0 --force shadow3.pkg - $(LOCAL_GHC_PKGSHADOW3) list + $(LOCAL_GHC_PKGSHADOW3) register -v0 --force shadow1.pkg + @echo "databases 1 and 2:" + $(LOCAL_GHC_PKGSHADOW12) list + @echo "databases 1 and 3:" + $(LOCAL_GHC_PKGSHADOW13) list echo "main = return ()" >shadow.hs # -# In this test, shadow-1-XXX is shadowed by shadow-1-YYY, which causes -# shadowdep-1-XXX to be unavailable: +# In this test, shadow-1-XXX with ABI hash aaa conflicts with shadow-1-XXX with +# ABI hash bbb, so GHC errors # @echo "should FAIL:" - '$(TEST_HC)' $(TEST_HC_OPTS) -package-db $(PKGCONFSHADOW1) -package-db $(PKGCONFSHADOW2) -package shadowdep -c shadow.hs -fno-code || true -# -# Reversing the order of the package.conf files should fix the problem: + if '$(TEST_HC)' $(TEST_HC_OPTS) -package-db $(PKGCONFSHADOW1) -package-db $(PKGCONFSHADOW2) -package shadowdep -c shadow.hs -fno-code; then false; else true; fi # - @echo "should SUCCEED:" - '$(TEST_HC)' $(TEST_HC_OPTS) -package-db $(PKGCONFSHADOW2) -package-db $(PKGCONFSHADOW1) -package shadowdep -c shadow.hs -fno-code || true +# Reversing the orders of the configs does not fix the problem +# + @echo "should FAIL:" + if '$(TEST_HC)' $(TEST_HC_OPTS) -package-db $(PKGCONFSHADOW2) -package-db $(PKGCONFSHADOW1) -package shadowdep -c shadow.hs -fno-code; then false; else true; fi # -# We can also fix the problem by using an explicit -package-id flag to -# specify a package we really want to use: +# When the ABIs are the same, there is no problem # @echo "should SUCCEED:" - '$(TEST_HC)' $(TEST_HC_OPTS) -package-db $(PKGCONFSHADOW1) -package-db $(PKGCONFSHADOW2) -package-id shadowdep-1-XXX -c shadow.hs -fno-code + '$(TEST_HC)' $(TEST_HC_OPTS) -package-db $(PKGCONFSHADOW3) -package-db $(PKGCONFSHADOW1) -package shadowdep -c shadow.hs -fno-code # If we pass --global, we should ignore instances in the user database T5442a: @@ -210,7 +218,7 @@ T5442d: '$(GHC_PKG)' init package.conf.T5442d.user '$(GHC_PKG)' init package.conf.T5442d.extra '$(GHC_PKG)' -f package.conf.T5442d.global register --force-files shadow1.pkg 2>/dev/null - '$(GHC_PKG)' -f package.conf.T5442d.user register --force-files shadow3.pkg 2>/dev/null + '$(GHC_PKG)' -f package.conf.T5442d.user register --force-files shadow4.pkg 2>/dev/null '$(GHC_PKG)' --global-package-db=package.conf.T5442d.global -f package.conf.T5442d.extra register --force-files shadow2.pkg 2>/dev/null '$(GHC_PKG)' --global-package-db=package.conf.T5442d.global --user-package-db=package.conf.T5442d.user -f package.conf.T5442d.extra --global unregister shadow --force @echo "global (should be empty):" diff --git a/testsuite/tests/cabal/T1750A.pkg b/testsuite/tests/cabal/T1750A.pkg index 3f4a96e22b..9bda51eea0 100644 --- a/testsuite/tests/cabal/T1750A.pkg +++ b/testsuite/tests/cabal/T1750A.pkg @@ -1,5 +1,4 @@ name: T1750A version: 1 id: T1750A-1-XXX -key: T1750A-1 depends: T1750B-1-XXX diff --git a/testsuite/tests/cabal/T1750B.pkg b/testsuite/tests/cabal/T1750B.pkg index caaaefaa1a..479ce7092c 100644 --- a/testsuite/tests/cabal/T1750B.pkg +++ b/testsuite/tests/cabal/T1750B.pkg @@ -1,5 +1,4 @@ name: T1750B version: 1 id: T1750B-1-XXX -key: T1750B-1 depends: T1750A-1-XXX diff --git a/testsuite/tests/cabal/T5442d.stdout b/testsuite/tests/cabal/T5442d.stdout index 05c6619dde..f3214578d2 100644 --- a/testsuite/tests/cabal/T5442d.stdout +++ b/testsuite/tests/cabal/T5442d.stdout @@ -1,8 +1,8 @@ Reading package info from "shadow1.pkg" ... done. -Reading package info from "shadow3.pkg" ... done. +Reading package info from "shadow4.pkg" ... done. Reading package info from "shadow2.pkg" ... done. global (should be empty): user: -shadow-1 +shadow-2 extra: shadowdep-1 diff --git a/testsuite/tests/cabal/cabal03/Makefile b/testsuite/tests/cabal/cabal03/Makefile index b5520e3d08..97659344d9 100644 --- a/testsuite/tests/cabal/cabal03/Makefile +++ b/testsuite/tests/cabal/cabal03/Makefile @@ -20,14 +20,14 @@ cabal03: clean '$(GHC_PKG)' init tmp.d '$(TEST_HC)' -v0 --make Setup cd p && $(SETUP) clean - cd p && $(SETUP) configure $(CABAL_MINIMAL_BUILD) --with-ghc='$(TEST_HC)' --ghc-options='$(TEST_HC_OPTS)' --package-db=../tmp.d --disable-optimisation --ghc-pkg-option=--force + cd p && $(SETUP) configure $(CABAL_MINIMAL_BUILD) --with-ghc='$(TEST_HC)' --ghc-options='$(TEST_HC_OPTS)' --package-db=../tmp.d --disable-optimisation --ghc-pkg-option=--force --ipid p-noopt cd p && $(SETUP) build cd p && $(SETUP) register cd q && $(SETUP) configure $(CABAL_MINIMAL_BUILD) --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 $(CABAL_MINIMAL_BUILD) --with-ghc='$(TEST_HC)' --ghc-options='$(TEST_HC_OPTS)' --package-db=../tmp.d --ghc-pkg-option=--force + cd p && $(SETUP) configure $(CABAL_MINIMAL_BUILD) --with-ghc='$(TEST_HC)' --ghc-options='$(TEST_HC_OPTS)' --package-db=../tmp.d --ghc-pkg-option=--force --ipid p-withopt cd p && $(SETUP) build cd p && $(SETUP) register cd r && ! ../Setup configure $(CABAL_MINIMAL_BUILD) --with-ghc='$(TEST_HC)' --ghc-options='$(TEST_HC_OPTS)' --package-db=../tmp.d --ghc-pkg-option=--force diff --git a/testsuite/tests/cabal/cabal06/Makefile b/testsuite/tests/cabal/cabal06/Makefile index 8b918a0e2c..9f47ea5756 100644 --- a/testsuite/tests/cabal/cabal06/Makefile +++ b/testsuite/tests/cabal/cabal06/Makefile @@ -4,7 +4,7 @@ include $(TOP)/mk/test.mk SETUP=../Setup -v0 -# This test is for packages whose package IDs overlap, but whose package keys +# This test is for packages whose package IDs overlap, but whose IPIDs # do not. # # 1. install p-1.0 @@ -15,7 +15,7 @@ SETUP=../Setup -v0 # 6. install r-1.0 asking for p-1.0 # # The notable steps are (4), which previously would have required a reinstall, -# and (6), where the dependency solver picks between two package keys with the +# and (6), where the dependency solver picks between two IPIDs with the # same package ID based on their depenencies. # # ./Setup configure is pretty dumb, so we spoonfeed it precisely the @@ -29,7 +29,7 @@ cabal06: clean cd p-1.0 && $(SETUP) configure $(CABAL_MINIMAL_BUILD) --with-ghc='$(TEST_HC)' --ghc-options='$(TEST_HC_OPTS)' --package-db=../tmp.d --prefix='$(PWD)/inst-a' --ghc-pkg-options='--enable-multi-instance' cd p-1.0 && $(SETUP) build cd p-1.0 && $(SETUP) copy - cd p-1.0 && $(SETUP) register + (cd p-1.0 && $(SETUP) register --print-ipid) > tmp_p_1_0 cd q && $(SETUP) clean cd q && $(SETUP) configure $(CABAL_MINIMAL_BUILD) --with-ghc='$(TEST_HC)' --ghc-options='$(TEST_HC_OPTS)' --package-db=../tmp.d --prefix='$(PWD)/inst-b' --ghc-pkg-options='--enable-multi-instance' cd q && $(SETUP) build @@ -39,16 +39,16 @@ cabal06: clean cd p-1.1 && $(SETUP) configure $(CABAL_MINIMAL_BUILD) --with-ghc='$(TEST_HC)' --ghc-options='$(TEST_HC_OPTS)' --package-db=../tmp.d --prefix='$(PWD)/inst-c' --ghc-pkg-options='--enable-multi-instance' cd p-1.1 && $(SETUP) build cd p-1.1 && $(SETUP) copy - cd p-1.1 && $(SETUP) register + (cd p-1.1 && $(SETUP) register --print-ipid) > tmp_p_1_1 cd q && $(SETUP) clean cd q && $(SETUP) configure $(CABAL_MINIMAL_BUILD) --with-ghc='$(TEST_HC)' --ghc-options='$(TEST_HC_OPTS)' --package-db=../tmp.d --constraint="p==1.1" --prefix='$(PWD)/inst-d' --ghc-pkg-options='--enable-multi-instance' cd q && $(SETUP) build cd q && $(SETUP) copy (cd q && $(SETUP) register --print-ipid) > tmp_second_q @echo "Does the first instance of q depend on p-1.0?" - '$(GHC_PKG)' field --ipid `cat tmp_first_q` depends -f tmp.d | grep p-1.0 | wc -l | sed 's/[[:space:]]//g' + '$(GHC_PKG)' field --ipid `cat tmp_first_q` depends -f tmp.d | grep `cat tmp_p_1_0` | wc -l | sed 's/[[:space:]]//g' @echo "Does the second instance of q depend on p-1.0?" - '$(GHC_PKG)' field --ipid `cat tmp_second_q` depends -f tmp.d | grep p-1.1 | wc -l | sed 's/[[:space:]]//g' + '$(GHC_PKG)' field --ipid `cat tmp_second_q` depends -f tmp.d | grep `cat tmp_p_1_1` | wc -l | sed 's/[[:space:]]//g' cd r && $(SETUP) clean cd r && ../Setup configure $(CABAL_MINIMAL_BUILD) --with-ghc='$(TEST_HC)' --ghc-options='$(TEST_HC_OPTS)' --package-db=../tmp.d --dependency="q=`cat ../tmp_first_q`" --constraint="p==1.0" --prefix='$(PWD)/inst-e' --ghc-pkg-options='--enable-multi-instance' cd r && $(SETUP) build diff --git a/testsuite/tests/cabal/cabal07/all.T b/testsuite/tests/cabal/cabal07/all.T index 2286f30783..2052c891f2 100644 --- a/testsuite/tests/cabal/cabal07/all.T +++ b/testsuite/tests/cabal/cabal07/all.T @@ -3,10 +3,7 @@ if default_testopts.cleanup != '': else: cleanup = '' -def normaliseContainersPackage(str): - return re.sub('containers-[^@]+@[A-Za-z0-9]+', 'containers-<VERSION>@<HASH>', str) - test('cabal07', - normalise_errmsg_fun(normaliseContainersPackage), + normalise_version('containers'), run_command, ['$MAKE -s --no-print-directory cabal07 ' + cleanup]) diff --git a/testsuite/tests/cabal/cabal07/cabal07.stderr b/testsuite/tests/cabal/cabal07/cabal07.stderr index 23249b68ff..b1b90c1528 100644 --- a/testsuite/tests/cabal/cabal07/cabal07.stderr +++ b/testsuite/tests/cabal/cabal07/cabal07.stderr @@ -1,6 +1,6 @@ Q.hs:3:8: error: Could not find module ‘Data.Set’ - It is a member of the hidden package ‘containers-0.5.6.2@0tT640fErehCGZtZRn6YbE’. + It is a member of the hidden package ‘containers-0.5.6.2@containers-0.5.6.2’. Perhaps you need to add ‘containers’ to the build-depends in your .cabal file. Use -v to see a list of the files searched for. diff --git a/testsuite/tests/cabal/ghcpkg01.stdout b/testsuite/tests/cabal/ghcpkg01.stdout index c8faf7fdbb..c056cf9824 100644 --- a/testsuite/tests/cabal/ghcpkg01.stdout +++ b/testsuite/tests/cabal/ghcpkg01.stdout @@ -4,7 +4,7 @@ Reading package info from "test.pkg" ... done. name: testpkg version: 1.2.3.4 id: testpkg-1.2.3.4-XXX -key: testpkg-1.2.3.4 +key: testpkg-1.2.3.4-XXX license: BSD3 copyright: (c) The Univsersity of Glasgow 2004 maintainer: glasgow-haskell-users@haskell.org @@ -19,17 +19,18 @@ exposed: True exposed-modules: A hidden-modules: B C.D +abi: trusted: False import-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg" library-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg" -hs-libraries: testpkg-1.2.3.4 +hs-libraries: testpkg-1.2.3.4-XXX include-dirs: /usr/local/include/testpkg "c:/Program Files/testpkg" pkgroot: name: testpkg version: 1.2.3.4 id: testpkg-1.2.3.4-XXX -key: testpkg-1.2.3.4 +key: testpkg-1.2.3.4-XXX license: BSD3 copyright: (c) The Univsersity of Glasgow 2004 maintainer: glasgow-haskell-users@haskell.org @@ -44,10 +45,11 @@ exposed: True exposed-modules: A hidden-modules: B C.D +abi: trusted: False import-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg" library-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg" -hs-libraries: testpkg-1.2.3.4 +hs-libraries: testpkg-1.2.3.4-XXX include-dirs: /usr/local/include/testpkg "c:/Program Files/testpkg" pkgroot: @@ -60,7 +62,7 @@ local01.package.conf: name: testpkg version: 2.0 id: testpkg-2.0-XXX -key: testpkg-2.0 +key: testpkg-2.0-XXX license: BSD3 copyright: (c) The Univsersity of Glasgow 2004 maintainer: glasgow-haskell-users@haskell.org @@ -75,17 +77,18 @@ exposed: False exposed-modules: A hidden-modules: B C.D C.E +abi: trusted: False import-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg" library-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg" -hs-libraries: testpkg-2.0 +hs-libraries: testpkg-2.0-XXX include-dirs: /usr/local/include/testpkg "c:/Program Files/testpkg" pkgroot: name: testpkg version: 2.0 id: testpkg-2.0-XXX -key: testpkg-2.0 +key: testpkg-2.0-XXX license: BSD3 copyright: (c) The Univsersity of Glasgow 2004 maintainer: glasgow-haskell-users@haskell.org @@ -100,17 +103,18 @@ exposed: False exposed-modules: A hidden-modules: B C.D C.E +abi: trusted: False import-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg" library-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg" -hs-libraries: testpkg-2.0 +hs-libraries: testpkg-2.0-XXX include-dirs: /usr/local/include/testpkg "c:/Program Files/testpkg" pkgroot: --- name: testpkg version: 1.2.3.4 id: testpkg-1.2.3.4-XXX -key: testpkg-1.2.3.4 +key: testpkg-1.2.3.4-XXX license: BSD3 copyright: (c) The Univsersity of Glasgow 2004 maintainer: glasgow-haskell-users@haskell.org @@ -125,10 +129,11 @@ exposed: True exposed-modules: A hidden-modules: B C.D +abi: trusted: False import-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg" library-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg" -hs-libraries: testpkg-1.2.3.4 +hs-libraries: testpkg-1.2.3.4-XXX include-dirs: /usr/local/include/testpkg "c:/Program Files/testpkg" pkgroot: @@ -142,7 +147,7 @@ Reading package info from "test3.pkg" ... done. name: testpkg version: 1.2.3.4 id: testpkg-1.2.3.4-XXX -key: testpkg-1.2.3.4 +key: testpkg-1.2.3.4-XXX license: BSD3 copyright: (c) The Univsersity of Glasgow 2004 maintainer: glasgow-haskell-users@haskell.org @@ -157,10 +162,11 @@ exposed: False exposed-modules: A hidden-modules: B C.D +abi: trusted: False import-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg" library-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg" -hs-libraries: testpkg-1.2.3.4 +hs-libraries: testpkg-1.2.3.4-XXX include-dirs: /usr/local/include/testpkg "c:/Program Files/testpkg" pkgroot: diff --git a/testsuite/tests/cabal/ghcpkg03.stderr b/testsuite/tests/cabal/ghcpkg03.stderr index 05d288dce2..31eb7ecee5 100644 --- a/testsuite/tests/cabal/ghcpkg03.stderr +++ b/testsuite/tests/cabal/ghcpkg03.stderr @@ -7,7 +7,7 @@ testpkg-1.2.3.4: include-dirs: c:/Program Files/testpkg is a relative path which testpkg-1.2.3.4: cannot find any of ["A.hi","A.p_hi","A.dyn_hi"] (ignoring) testpkg-1.2.3.4: cannot find any of ["B.hi","B.p_hi","B.dyn_hi"] (ignoring) testpkg-1.2.3.4: cannot find any of ["C/D.hi","C/D.p_hi","C/D.dyn_hi"] (ignoring) -testpkg-1.2.3.4: cannot find any of ["libtestpkg-1.2.3.4.a","libtestpkg-1.2.3.4.p_a","libtestpkg-1.2.3.4-ghc<VERSION>.so","libtestpkg-1.2.3.4-ghc<VERSION>.dylib","testpkg-1.2.3.4-ghc<VERSION>.dll"] on library path (ignoring) +testpkg-1.2.3.4: cannot find any of ["libtestpkg-1.2.3.4-XXX.a","libtestpkg-1.2.3.4-XXX.p_a","libtestpkg-1.2.3.4-XXX-ghc7.11.20150825.so","libtestpkg-1.2.3.4-XXX-ghc7.11.20150825.dylib","testpkg-1.2.3.4-XXX-ghc7.11.20150825.dll"] on library path (ignoring) testpkg-2.0: Warning: library-dirs: /usr/local/lib/testpkg doesn't exist or isn't a directory testpkg-2.0: Warning: include-dirs: /usr/local/include/testpkg doesn't exist or isn't a directory testpkg-2.0: import-dirs: /usr/local/lib/testpkg doesn't exist or isn't a directory (ignoring) @@ -18,7 +18,7 @@ testpkg-2.0: cannot find any of ["A.hi","A.p_hi","A.dyn_hi"] (ignoring) testpkg-2.0: cannot find any of ["B.hi","B.p_hi","B.dyn_hi"] (ignoring) testpkg-2.0: cannot find any of ["C/D.hi","C/D.p_hi","C/D.dyn_hi"] (ignoring) testpkg-2.0: cannot find any of ["C/E.hi","C/E.p_hi","C/E.dyn_hi"] (ignoring) -testpkg-2.0: cannot find any of ["libtestpkg-2.0.a","libtestpkg-2.0.p_a","libtestpkg-2.0-ghc<VERSION>.so","libtestpkg-2.0-ghc<VERSION>.dylib","testpkg-2.0-ghc<VERSION>.dll"] on library path (ignoring) +testpkg-2.0: cannot find any of ["libtestpkg-2.0-XXX.a","libtestpkg-2.0-XXX.p_a","libtestpkg-2.0-XXX-ghc7.11.20150825.so","libtestpkg-2.0-XXX-ghc7.11.20150825.dylib","testpkg-2.0-XXX-ghc7.11.20150825.dll"] on library path (ignoring) testpkg-1.2.3.4: Warning: library-dirs: /usr/local/lib/testpkg doesn't exist or isn't a directory testpkg-1.2.3.4: Warning: include-dirs: /usr/local/include/testpkg doesn't exist or isn't a directory testpkg-1.2.3.4: import-dirs: /usr/local/lib/testpkg doesn't exist or isn't a directory (ignoring) @@ -28,4 +28,4 @@ testpkg-1.2.3.4: include-dirs: c:/Program Files/testpkg is a relative path which testpkg-1.2.3.4: cannot find any of ["A.hi","A.p_hi","A.dyn_hi"] (ignoring) testpkg-1.2.3.4: cannot find any of ["B.hi","B.p_hi","B.dyn_hi"] (ignoring) testpkg-1.2.3.4: cannot find any of ["C/D.hi","C/D.p_hi","C/D.dyn_hi"] (ignoring) -testpkg-1.2.3.4: cannot find any of ["libtestpkg-1.2.3.4.a","libtestpkg-1.2.3.4.p_a","libtestpkg-1.2.3.4-ghc<VERSION>.so","libtestpkg-1.2.3.4-ghc<VERSION>.dylib","testpkg-1.2.3.4-ghc<VERSION>.dll"] on library path (ignoring) +testpkg-1.2.3.4: cannot find any of ["libtestpkg-1.2.3.4-XXX.a","libtestpkg-1.2.3.4-XXX.p_a","libtestpkg-1.2.3.4-XXX-ghc7.11.20150825.so","libtestpkg-1.2.3.4-XXX-ghc7.11.20150825.dylib","testpkg-1.2.3.4-XXX-ghc7.11.20150825.dll"] on library path (ignoring) diff --git a/testsuite/tests/cabal/ghcpkg05.stderr b/testsuite/tests/cabal/ghcpkg05.stderr index df8d11a6b9..7440a6fb6c 100644 --- a/testsuite/tests/cabal/ghcpkg05.stderr +++ b/testsuite/tests/cabal/ghcpkg05.stderr @@ -9,7 +9,30 @@ There are problems in package testpkg-2.0: cannot find any of ["B.hi","B.p_hi","B.dyn_hi"] cannot find any of ["C/D.hi","C/D.p_hi","C/D.dyn_hi"] cannot find any of ["C/E.hi","C/E.p_hi","C/E.dyn_hi"] - cannot find any of ["libtestpkg-2.0.a","libtestpkg-2.0.p_a","libtestpkg-2.0-ghc<VERSION>.so","libtestpkg-2.0-ghc<VERSION>.dylib","testpkg-2.0-ghc<VERSION>.dll"] on library path + cannot find any of ["libtestpkg-2.0-XXX.a","libtestpkg-2.0-XXX.p_a","libtestpkg-2.0-XXX-ghc7.11.20150825.so","libtestpkg-2.0-XXX-ghc7.11.20150825.dylib","testpkg-2.0-XXX-ghc7.11.20150825.dll"] on library path +Warning: haddock-interfaces: /home/hs01/ezyang/ghc-quick2/compiler/stage2/doc/html/ghc/ghc.haddock doesn't exist or isn't a file +Warning: haddock-interfaces: /home/hs01/ezyang/ghc-quick2/libraries/haskeline/dist-install/doc/html/haskeline/haskeline.haddock doesn't exist or isn't a file +Warning: haddock-interfaces: /home/hs01/ezyang/ghc-quick2/libraries/terminfo/dist-install/doc/html/terminfo/terminfo.haddock doesn't exist or isn't a file +Warning: haddock-interfaces: /home/hs01/ezyang/ghc-quick2/libraries/transformers/dist-install/doc/html/transformers/transformers.haddock doesn't exist or isn't a file +Warning: haddock-interfaces: /home/hs01/ezyang/ghc-quick2/libraries/hoopl/dist-install/doc/html/hoopl/hoopl.haddock doesn't exist or isn't a file +Warning: haddock-interfaces: /home/hs01/ezyang/ghc-quick2/libraries/bin-package-db/dist-install/doc/html/bin-package-db/bin-package-db.haddock doesn't exist or isn't a file +Warning: haddock-interfaces: /home/hs01/ezyang/ghc-quick2/libraries/Cabal/Cabal/dist-install/doc/html/Cabal/Cabal.haddock doesn't exist or isn't a file +Warning: haddock-interfaces: /home/hs01/ezyang/ghc-quick2/libraries/binary/dist-install/doc/html/binary/binary.haddock doesn't exist or isn't a file +Warning: haddock-interfaces: /home/hs01/ezyang/ghc-quick2/libraries/template-haskell/dist-install/doc/html/template-haskell/template-haskell.haddock doesn't exist or isn't a file +Warning: haddock-interfaces: /home/hs01/ezyang/ghc-quick2/libraries/pretty/dist-install/doc/html/pretty/pretty.haddock doesn't exist or isn't a file +Warning: haddock-interfaces: /home/hs01/ezyang/ghc-quick2/libraries/hpc/dist-install/doc/html/hpc/hpc.haddock doesn't exist or isn't a file +Warning: haddock-interfaces: /home/hs01/ezyang/ghc-quick2/libraries/process/dist-install/doc/html/process/process.haddock doesn't exist or isn't a file +Warning: haddock-interfaces: /home/hs01/ezyang/ghc-quick2/libraries/directory/dist-install/doc/html/directory/directory.haddock doesn't exist or isn't a file +Warning: haddock-interfaces: /home/hs01/ezyang/ghc-quick2/libraries/unix/dist-install/doc/html/unix/unix.haddock doesn't exist or isn't a file +Warning: haddock-interfaces: /home/hs01/ezyang/ghc-quick2/libraries/time/dist-install/doc/html/time/time.haddock doesn't exist or isn't a file +Warning: haddock-interfaces: /home/hs01/ezyang/ghc-quick2/libraries/containers/dist-install/doc/html/containers/containers.haddock doesn't exist or isn't a file +Warning: haddock-interfaces: /home/hs01/ezyang/ghc-quick2/libraries/bytestring/dist-install/doc/html/bytestring/bytestring.haddock doesn't exist or isn't a file +Warning: haddock-interfaces: /home/hs01/ezyang/ghc-quick2/libraries/deepseq/dist-install/doc/html/deepseq/deepseq.haddock doesn't exist or isn't a file +Warning: haddock-interfaces: /home/hs01/ezyang/ghc-quick2/libraries/array/dist-install/doc/html/array/array.haddock doesn't exist or isn't a file +Warning: haddock-interfaces: /home/hs01/ezyang/ghc-quick2/libraries/filepath/dist-install/doc/html/filepath/filepath.haddock doesn't exist or isn't a file +Warning: haddock-interfaces: /home/hs01/ezyang/ghc-quick2/libraries/base/dist-install/doc/html/base/base.haddock doesn't exist or isn't a file +Warning: haddock-interfaces: /home/hs01/ezyang/ghc-quick2/libraries/integer-gmp/dist-install/doc/html/integer-gmp/integer-gmp.haddock doesn't exist or isn't a file +Warning: haddock-interfaces: /home/hs01/ezyang/ghc-quick2/libraries/ghc-prim/dist-install/doc/html/ghc-prim/ghc-prim.haddock doesn't exist or isn't a file The following packages are broken, either because they have a problem listed above, or because they depend on a broken package. diff --git a/testsuite/tests/cabal/shadow.stderr b/testsuite/tests/cabal/shadow.stderr index a0a38cde22..3825896e85 100644 --- a/testsuite/tests/cabal/shadow.stderr +++ b/testsuite/tests/cabal/shadow.stderr @@ -1,4 +1,4 @@ -<command line>: cannot satisfy -package shadowdep: - shadowdep-1-XXX is unusable due to missing or recursive dependencies: - shadow-1-XXX - (use -v for more information) +<command line>: package db: duplicate packages with incompatible ABIs: + shadow-1-XXX has ABIs: aaa, bbb +<command line>: package db: duplicate packages with incompatible ABIs: + shadow-1-XXX has ABIs: aaa, bbb diff --git a/testsuite/tests/cabal/shadow.stdout b/testsuite/tests/cabal/shadow.stdout index 0d14e9cb8a..f4b783aa7d 100644 --- a/testsuite/tests/cabal/shadow.stdout +++ b/testsuite/tests/cabal/shadow.stdout @@ -1,3 +1,4 @@ +databases 1 and 2: localshadow1.package.conf: (shadow-1) (shadowdep-1) @@ -5,6 +6,14 @@ localshadow1.package.conf: localshadow2.package.conf: (shadow-1) +databases 1 and 3: +localshadow1.package.conf: + (shadow-1) + (shadowdep-1) + +localshadow3.package.conf: + (shadow-1) + +should FAIL: should FAIL: -should SUCCEED: should SUCCEED: diff --git a/testsuite/tests/cabal/shadow1.pkg b/testsuite/tests/cabal/shadow1.pkg index 553ebeb776..1e3960202c 100644 --- a/testsuite/tests/cabal/shadow1.pkg +++ b/testsuite/tests/cabal/shadow1.pkg @@ -1,5 +1,6 @@ name: shadow version: 1 id: shadow-1-XXX -key: shadow-1 +key: shadow-1-XXX +abi: aaa depends: diff --git a/testsuite/tests/cabal/shadow2.pkg b/testsuite/tests/cabal/shadow2.pkg index ae89641176..5cd54cca02 100644 --- a/testsuite/tests/cabal/shadow2.pkg +++ b/testsuite/tests/cabal/shadow2.pkg @@ -1,5 +1,5 @@ name: shadowdep version: 1 id: shadowdep-1-XXX -key: shadowdep-1 +key: shadowdep-1-XXX depends: shadow-1-XXX diff --git a/testsuite/tests/cabal/shadow3.pkg b/testsuite/tests/cabal/shadow3.pkg index 62c93f95e1..6640e9da10 100644 --- a/testsuite/tests/cabal/shadow3.pkg +++ b/testsuite/tests/cabal/shadow3.pkg @@ -1,5 +1,6 @@ name: shadow version: 1 -id: shadow-1-YYY -key: shadow-1 +id: shadow-1-XXX +key: shadow-1-XXX +abi: bbb depends: diff --git a/testsuite/tests/cabal/shadow4.pkg b/testsuite/tests/cabal/shadow4.pkg new file mode 100644 index 0000000000..fb4e08e4a4 --- /dev/null +++ b/testsuite/tests/cabal/shadow4.pkg @@ -0,0 +1,6 @@ +name: shadow +version: 2 +id: shadow-2-ZZZ +key: shadow-2-ZZZ +abi: zzz +depends: diff --git a/testsuite/tests/cabal/test.pkg b/testsuite/tests/cabal/test.pkg index 42c557a0f9..4a1adc93eb 100644 --- a/testsuite/tests/cabal/test.pkg +++ b/testsuite/tests/cabal/test.pkg @@ -1,7 +1,7 @@ name: testpkg version: 1.2.3.4 id: testpkg-1.2.3.4-XXX -key: testpkg-1.2.3.4 +key: testpkg-1.2.3.4-XXX license: BSD3 copyright: (c) The Univsersity of Glasgow 2004 maintainer: glasgow-haskell-users@haskell.org @@ -17,4 +17,4 @@ hidden-modules: B, "C.D" import-dirs: /usr/local/lib/testpkg, "c:/Program Files/testpkg" library-dirs: /usr/local/lib/testpkg, "c:/Program Files/testpkg" include-dirs: /usr/local/include/testpkg, "c:/Program Files/testpkg" -hs-libraries: testpkg-1.2.3.4 +hs-libraries: testpkg-1.2.3.4-XXX diff --git a/testsuite/tests/cabal/test2.pkg b/testsuite/tests/cabal/test2.pkg index c027ed3a15..0c627d2e13 100644 --- a/testsuite/tests/cabal/test2.pkg +++ b/testsuite/tests/cabal/test2.pkg @@ -1,7 +1,7 @@ name: "testpkg" version: 2.0 id: testpkg-2.0-XXX -key: testpkg-2.0 +key: testpkg-2.0-XXX license: BSD3 copyright: (c) The Univsersity of Glasgow 2004 maintainer: glasgow-haskell-users@haskell.org @@ -17,4 +17,4 @@ hidden-modules: B, "C.D", "C.E" import-dirs: /usr/local/lib/testpkg, "c:/Program Files/testpkg" library-dirs: /usr/local/lib/testpkg, "c:/Program Files/testpkg" include-dirs: /usr/local/include/testpkg, "c:/Program Files/testpkg" -hs-libraries: testpkg-2.0 +hs-libraries: testpkg-2.0-XXX diff --git a/testsuite/tests/cabal/test3.pkg b/testsuite/tests/cabal/test3.pkg index 8f1ca04366..2c017422c0 100644 --- a/testsuite/tests/cabal/test3.pkg +++ b/testsuite/tests/cabal/test3.pkg @@ -1,7 +1,7 @@ name: "testpkg" version: 3.0 id: testpkg-3.0-XXX -key: testpkg-3.0 +key: testpkg-3.0-XXX license: BSD3 copyright: (c) The Univsersity of Glasgow 2004 maintainer: glasgow-haskell-users@haskell.org diff --git a/testsuite/tests/cabal/test4.pkg b/testsuite/tests/cabal/test4.pkg index c4b1883512..eba9509572 100644 --- a/testsuite/tests/cabal/test4.pkg +++ b/testsuite/tests/cabal/test4.pkg @@ -1,7 +1,7 @@ name: "testpkg" version: 4.0 id: testpkg-4.0-XXX -key: testpkg-4.0 +key: testpkg-4.0-XXX license: BSD3 copyright: (c) The Univsersity of Glasgow 2004 maintainer: glasgow-haskell-users@haskell.org diff --git a/testsuite/tests/cabal/test5.pkg b/testsuite/tests/cabal/test5.pkg index 48e198cd30..c66d19bc0c 100644 --- a/testsuite/tests/cabal/test5.pkg +++ b/testsuite/tests/cabal/test5.pkg @@ -1,7 +1,7 @@ name: "newtestpkg" version: 2.0 id: newtestpkg-2.0-XXX -key: newtestpkg-2.0 +key: newtestpkg-2.0-XXX license: BSD3 copyright: (c) The Univsersity of Glasgow 2004 maintainer: glasgow-haskell-users@haskell.org @@ -16,4 +16,4 @@ exposed-modules: A hidden-modules: B, "C.D", "C.E" import-dirs: /usr/local/lib/testpkg, "c:/Program Files/testpkg" library-dirs: /usr/local/lib/testpkg, "c:/Program Files/testpkg" -hs-libraries: testpkg-2.0 +hs-libraries: testpkg-2.0-XXX diff --git a/testsuite/tests/cabal/test7a.pkg b/testsuite/tests/cabal/test7a.pkg index 7eaeea2a8a..ae78add404 100644 --- a/testsuite/tests/cabal/test7a.pkg +++ b/testsuite/tests/cabal/test7a.pkg @@ -1,7 +1,7 @@ name: testpkg7a version: 1.0 id: testpkg7a-1.0-XXX -key: testpkg7a-1.0 +key: testpkg7a-1.0-XXX license: BSD3 copyright: (c) The Univsersity of Glasgow 2004 maintainer: glasgow-haskell-users@haskell.org @@ -13,5 +13,5 @@ category: none author: simonmar@microsoft.com exposed: True exposed-modules: E, A from testpkg-1.2.3.4-XXX:A, A1 from testpkg-1.2.3.4-XXX:A, E2 from testpkg7a-1.0-XXX:E -hs-libraries: testpkg7a-1.0 +hs-libraries: testpkg7a-1.0-XXX depends: testpkg-1.2.3.4-XXX diff --git a/testsuite/tests/cabal/test7b.pkg b/testsuite/tests/cabal/test7b.pkg index f0bc6871f0..74b4b86014 100644 --- a/testsuite/tests/cabal/test7b.pkg +++ b/testsuite/tests/cabal/test7b.pkg @@ -1,7 +1,7 @@ name: testpkg7b version: 1.0 id: testpkg7b-1.0-XXX -key: testpkg7b-1.0 +key: testpkg7b-1.0-XXX license: BSD3 copyright: (c) The Univsersity of Glasgow 2004 maintainer: glasgow-haskell-users@haskell.org @@ -13,5 +13,5 @@ category: none author: simonmar@microsoft.com exposed: True exposed-modules: F1 from testpkg-1.2.3.4-XXX:A, F2 from testpkg7a-1.0-XXX:A, F3 from testpkg7a-1.0-XXX:A1, F4 from testpkg7a-1.0-XXX:E, E from testpkg7a-1.0-XXX:E, E3 from testpkg7a-1.0-XXX:E2 -hs-libraries: testpkg7b-1.0 +hs-libraries: testpkg7b-1.0-XXX depends: testpkg-1.2.3.4-XXX, testpkg7a-1.0-XXX diff --git a/testsuite/tests/cabal/testdup.pkg b/testsuite/tests/cabal/testdup.pkg index 0e368e5ae8..bf1db32da4 100644 --- a/testsuite/tests/cabal/testdup.pkg +++ b/testsuite/tests/cabal/testdup.pkg @@ -1,6 +1,6 @@ name: testdup version: 1.0 id: testdup-1.0-XXX -key: testdup-1.0 +key: testdup-1.0-XXX license: BSD3 depends: testpkg-1.2.3.4-XXX testpkg-1.2.3.4-XXX |