diff options
| -rw-r--r-- | compiler/main/Packages.hs | 4 | ||||
| -rw-r--r-- | testsuite/.gitignore | 3 | ||||
| -rw-r--r-- | testsuite/tests/cabal/cabal08/Main.hs | 2 | ||||
| -rw-r--r-- | testsuite/tests/cabal/cabal08/Makefile | 32 | ||||
| -rw-r--r-- | testsuite/tests/cabal/cabal08/Setup.hs | 2 | ||||
| -rw-r--r-- | testsuite/tests/cabal/cabal08/all.T | 9 | ||||
| -rw-r--r-- | testsuite/tests/cabal/cabal08/cabal08.stdout | 6 | ||||
| -rw-r--r-- | testsuite/tests/cabal/cabal08/p1/ChangeLog.md | 5 | ||||
| -rw-r--r-- | testsuite/tests/cabal/cabal08/p1/LICENSE | 30 | ||||
| -rw-r--r-- | testsuite/tests/cabal/cabal08/p1/P.hs | 2 | ||||
| -rw-r--r-- | testsuite/tests/cabal/cabal08/p1/Setup.hs | 2 | ||||
| -rw-r--r-- | testsuite/tests/cabal/cabal08/p1/p.cabal | 14 | ||||
| -rw-r--r-- | testsuite/tests/cabal/cabal08/p2/ChangeLog.md | 5 | ||||
| -rw-r--r-- | testsuite/tests/cabal/cabal08/p2/LICENSE | 30 | ||||
| -rw-r--r-- | testsuite/tests/cabal/cabal08/p2/P.hs | 2 | ||||
| -rw-r--r-- | testsuite/tests/cabal/cabal08/p2/Setup.hs | 2 | ||||
| -rw-r--r-- | testsuite/tests/cabal/cabal08/p2/p.cabal | 14 |
17 files changed, 163 insertions, 1 deletions
diff --git a/compiler/main/Packages.hs b/compiler/main/Packages.hs index 2849b7e70a..f7bff71f1f 100644 --- a/compiler/main/Packages.hs +++ b/compiler/main/Packages.hs @@ -593,7 +593,9 @@ selectPackages matches pkgs unusable = let (ps,rest) = partition matches pkgs in if null ps then Left (filter (matches.fst) (Map.elems unusable)) - else Right (sortByVersion ps, rest) + -- NB: packages from later package databases are LATER + -- in the list. We want to prefer the latest package. + else Right (sortByVersion (reverse ps), rest) -- A package named on the command line can either include the -- version, or just the name if it is unambiguous. diff --git a/testsuite/.gitignore b/testsuite/.gitignore index 6b943590f6..e8e4114853 100644 --- a/testsuite/.gitignore +++ b/testsuite/.gitignore @@ -121,6 +121,9 @@ mk/ghcconfig*_test___spaces_ghc*.exe.mk /tests/cabal/cabal05/r-0.1.0.0/ /tests/cabal/cabal06/inst-*/ /tests/cabal/cabal06/tmp* +/tests/cabal/cabal08/Main +/tests/cabal/cabal08/inst-* +/tests/cabal/cabal08/tmp* /tests/cabal/local01.package.conf/ /tests/cabal/local03.package.conf/ /tests/cabal/local04.package.conf/ diff --git a/testsuite/tests/cabal/cabal08/Main.hs b/testsuite/tests/cabal/cabal08/Main.hs new file mode 100644 index 0000000000..f63ccafefb --- /dev/null +++ b/testsuite/tests/cabal/cabal08/Main.hs @@ -0,0 +1,2 @@ +import P +main = putStrLn p diff --git a/testsuite/tests/cabal/cabal08/Makefile b/testsuite/tests/cabal/cabal08/Makefile new file mode 100644 index 0000000000..06b98533c8 --- /dev/null +++ b/testsuite/tests/cabal/cabal08/Makefile @@ -0,0 +1,32 @@ +TOP=../../.. +include $(TOP)/mk/boilerplate.mk +include $(TOP)/mk/test.mk + +SETUP=../Setup -v0 + +# in both cases, p2 should be preferred +cabal08: clean + $(MAKE) clean + '$(GHC_PKG)' init tmp1.d + '$(GHC_PKG)' init tmp2.d + '$(TEST_HC)' -v0 --make Setup + cd p1 && $(SETUP) clean + cd p1 && $(SETUP) configure $(CABAL_MINIMAL_BUILD) --with-ghc='$(TEST_HC)' --ghc-options='$(TEST_HC_OPTS)' --package-db=../tmp1.d --prefix='$(PWD)/inst-p1' + cd p1 && $(SETUP) build + cd p1 && $(SETUP) copy + cd p1 && $(SETUP) register + cd p2 && $(SETUP) clean + cd p2 && $(SETUP) configure $(CABAL_MINIMAL_BUILD) --with-ghc='$(TEST_HC)' --ghc-options='$(TEST_HC_OPTS)' --package-db=../tmp2.d --prefix='$(PWD)/inst-p2' + cd p2 && $(SETUP) build + cd p2 && $(SETUP) copy + cd p2 && $(SETUP) register + '$(TEST_HC)' $(TEST_HC_OPTS) -package-db tmp1.d -package-db tmp2.d Main.hs + ./Main + '$(TEST_HC)' $(TEST_HC_OPTS) -package-db tmp1.d -package-db tmp2.d -hide-all-packages -package base -package p Main.hs + ./Main +ifneq "$(CLEANUP)" "" + $(MAKE) clean +endif + +clean : + $(RM) -r tmp*.d inst-* *.o *.hi */*.o */*.hi */Setup$(exeext) */dist Setup$(exeext) diff --git a/testsuite/tests/cabal/cabal08/Setup.hs b/testsuite/tests/cabal/cabal08/Setup.hs new file mode 100644 index 0000000000..9a994af677 --- /dev/null +++ b/testsuite/tests/cabal/cabal08/Setup.hs @@ -0,0 +1,2 @@ +import Distribution.Simple +main = defaultMain diff --git a/testsuite/tests/cabal/cabal08/all.T b/testsuite/tests/cabal/cabal08/all.T new file mode 100644 index 0000000000..fc4221a769 --- /dev/null +++ b/testsuite/tests/cabal/cabal08/all.T @@ -0,0 +1,9 @@ +if default_testopts.cleanup != '': + cleanup = 'CLEANUP=1' +else: + cleanup = '' + +test('cabal08', + normal, + run_command, + ['$MAKE -s --no-print-directory cabal08 ' + cleanup]) diff --git a/testsuite/tests/cabal/cabal08/cabal08.stdout b/testsuite/tests/cabal/cabal08/cabal08.stdout new file mode 100644 index 0000000000..8f97cd409f --- /dev/null +++ b/testsuite/tests/cabal/cabal08/cabal08.stdout @@ -0,0 +1,6 @@ +[1 of 1] Compiling Main ( Main.hs, Main.o ) +Linking Main ... +p2 +[1 of 1] Compiling Main ( Main.hs, Main.o ) +Linking Main ... +p2 diff --git a/testsuite/tests/cabal/cabal08/p1/ChangeLog.md b/testsuite/tests/cabal/cabal08/p1/ChangeLog.md new file mode 100644 index 0000000000..b454db5cb3 --- /dev/null +++ b/testsuite/tests/cabal/cabal08/p1/ChangeLog.md @@ -0,0 +1,5 @@ +# Revision history for p + +## 0.1.0.0 -- YYYY-mm-dd + +* First version. Released on an unsuspecting world. diff --git a/testsuite/tests/cabal/cabal08/p1/LICENSE b/testsuite/tests/cabal/cabal08/p1/LICENSE new file mode 100644 index 0000000000..c8cc6abc28 --- /dev/null +++ b/testsuite/tests/cabal/cabal08/p1/LICENSE @@ -0,0 +1,30 @@ +Copyright (c) 2015, Edward Z. Yang + +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided + with the distribution. + + * Neither the name of Edward Z. Yang nor the names of other + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/testsuite/tests/cabal/cabal08/p1/P.hs b/testsuite/tests/cabal/cabal08/p1/P.hs new file mode 100644 index 0000000000..e3109b2ef0 --- /dev/null +++ b/testsuite/tests/cabal/cabal08/p1/P.hs @@ -0,0 +1,2 @@ +module P where +p = "p1" diff --git a/testsuite/tests/cabal/cabal08/p1/Setup.hs b/testsuite/tests/cabal/cabal08/p1/Setup.hs new file mode 100644 index 0000000000..9a994af677 --- /dev/null +++ b/testsuite/tests/cabal/cabal08/p1/Setup.hs @@ -0,0 +1,2 @@ +import Distribution.Simple +main = defaultMain diff --git a/testsuite/tests/cabal/cabal08/p1/p.cabal b/testsuite/tests/cabal/cabal08/p1/p.cabal new file mode 100644 index 0000000000..8624a0497e --- /dev/null +++ b/testsuite/tests/cabal/cabal08/p1/p.cabal @@ -0,0 +1,14 @@ +name: p +version: 0.1.0.0 +license: BSD3 +license-file: LICENSE +author: Edward Z. Yang +maintainer: ezyang@cs.stanford.edu +build-type: Simple +extra-source-files: ChangeLog.md +cabal-version: >=1.10 + +library + exposed-modules: P + build-depends: base, containers + default-language: Haskell2010 diff --git a/testsuite/tests/cabal/cabal08/p2/ChangeLog.md b/testsuite/tests/cabal/cabal08/p2/ChangeLog.md new file mode 100644 index 0000000000..b454db5cb3 --- /dev/null +++ b/testsuite/tests/cabal/cabal08/p2/ChangeLog.md @@ -0,0 +1,5 @@ +# Revision history for p + +## 0.1.0.0 -- YYYY-mm-dd + +* First version. Released on an unsuspecting world. diff --git a/testsuite/tests/cabal/cabal08/p2/LICENSE b/testsuite/tests/cabal/cabal08/p2/LICENSE new file mode 100644 index 0000000000..c8cc6abc28 --- /dev/null +++ b/testsuite/tests/cabal/cabal08/p2/LICENSE @@ -0,0 +1,30 @@ +Copyright (c) 2015, Edward Z. Yang + +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided + with the distribution. + + * Neither the name of Edward Z. Yang nor the names of other + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/testsuite/tests/cabal/cabal08/p2/P.hs b/testsuite/tests/cabal/cabal08/p2/P.hs new file mode 100644 index 0000000000..2f8fe77f25 --- /dev/null +++ b/testsuite/tests/cabal/cabal08/p2/P.hs @@ -0,0 +1,2 @@ +module P where +p = "p2" diff --git a/testsuite/tests/cabal/cabal08/p2/Setup.hs b/testsuite/tests/cabal/cabal08/p2/Setup.hs new file mode 100644 index 0000000000..9a994af677 --- /dev/null +++ b/testsuite/tests/cabal/cabal08/p2/Setup.hs @@ -0,0 +1,2 @@ +import Distribution.Simple +main = defaultMain diff --git a/testsuite/tests/cabal/cabal08/p2/p.cabal b/testsuite/tests/cabal/cabal08/p2/p.cabal new file mode 100644 index 0000000000..dc88c82cbd --- /dev/null +++ b/testsuite/tests/cabal/cabal08/p2/p.cabal @@ -0,0 +1,14 @@ +name: p +version: 0.1.0.0 +license: BSD3 +license-file: LICENSE +author: Edward Z. Yang +maintainer: ezyang@cs.stanford.edu +build-type: Simple +extra-source-files: ChangeLog.md +cabal-version: >=1.10 + +library + exposed-modules: P + build-depends: base + default-language: Haskell2010 |