diff options
Diffstat (limited to 'testsuite')
| -rw-r--r-- | testsuite/tests/cabal/cabal05/Makefile | 5 | ||||
| -rw-r--r-- | testsuite/tests/cabal/cabal05/q/q.cabal | 3 | ||||
| -rw-r--r-- | testsuite/tests/cabal/cabal05/r/r.cabal | 5 | ||||
| -rw-r--r-- | testsuite/tests/cabal/cabal05/t/LICENSE | 0 | ||||
| -rw-r--r-- | testsuite/tests/cabal/cabal05/t/Setup.hs | 2 | ||||
| -rw-r--r-- | testsuite/tests/cabal/cabal05/t/T.hs | 3 | ||||
| -rw-r--r-- | testsuite/tests/cabal/cabal05/t/t.cabal | 11 |
7 files changed, 25 insertions, 4 deletions
diff --git a/testsuite/tests/cabal/cabal05/Makefile b/testsuite/tests/cabal/cabal05/Makefile index d4bc1c733a..d1ade74113 100644 --- a/testsuite/tests/cabal/cabal05/Makefile +++ b/testsuite/tests/cabal/cabal05/Makefile @@ -58,6 +58,9 @@ cabal05: clean cd s && $(SETUP) clean cd s && $(SETUP) configure $(CABAL_MINIMAL_BUILD) --with-ghc='$(TEST_HC)' --ghc-options='$(TEST_HC_OPTS)' --package-db=../tmp.d cd s && $(SETUP) build + cd t && $(SETUP) clean + cd t && $(SETUP) configure $(CABAL_MINIMAL_BUILD) --with-ghc='$(TEST_HC)' --ghc-options='$(TEST_HC_OPTS)' --package-db=../tmp.d + ! (cd t && $(SETUP) build) ifneq "$(CLEANUP)" "" $(MAKE) clean endif @@ -66,4 +69,4 @@ clean : '$(GHC_PKG)' unregister --force p >/dev/null 2>&1 || true '$(GHC_PKG)' unregister --force q >/dev/null 2>&1 || true '$(GHC_PKG)' unregister --force r >/dev/null 2>&1 || true - $(RM) -r p-* q-* r-* tmp.d *.o *.hi */*.o */*.hi */Setup$(exeext) */dist Setup$(exeext) + $(RM) -r p-* q-* r-* s-* t-* tmp.d *.o *.hi */*.o */*.hi */Setup$(exeext) */dist Setup$(exeext) diff --git a/testsuite/tests/cabal/cabal05/q/q.cabal b/testsuite/tests/cabal/cabal05/q/q.cabal index 2ea54f2e8d..338acdd382 100644 --- a/testsuite/tests/cabal/cabal05/q/q.cabal +++ b/testsuite/tests/cabal/cabal05/q/q.cabal @@ -25,5 +25,6 @@ library -- qualified=NO, where=SELF, renaming=YES, conflict=NO Q as QQ, -- qualified=NO, where=SELF, renaming=YES, conflict=YES (r) - Q as QMerge + Q as QMerge, + P2 as Conflict build-depends: base, p diff --git a/testsuite/tests/cabal/cabal05/r/r.cabal b/testsuite/tests/cabal/cabal05/r/r.cabal index d550340c0e..b2d4ab0939 100644 --- a/testsuite/tests/cabal/cabal05/r/r.cabal +++ b/testsuite/tests/cabal/cabal05/r/r.cabal @@ -14,7 +14,7 @@ library -- qualified=NO, where=DEP(BOTH), renaming=YES, conflict=NO P as RP2, -- qualified=NO, where=DEP(BOTH), renaming=YES, conflict=YES - P2 as PMerge, + P as PMerge, -- qualified=YES, where=DEP(ORIG), renaming=YES, conflict=NO p:P as RP, -- qualified=YES, where=DEP(REEX), renaming=YES, conflict=NO @@ -28,5 +28,6 @@ library -- qualified=YES, where=DEP, renaming=NO, conflict=YES (q) q:Q, -- qualified=YES, where=DEP(ORIG), renaming=YES, conflict=YES (q) - p:P2 as PMerge2 + p:P2 as PMerge2, + P as Conflict build-depends: base, p, q diff --git a/testsuite/tests/cabal/cabal05/t/LICENSE b/testsuite/tests/cabal/cabal05/t/LICENSE new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/testsuite/tests/cabal/cabal05/t/LICENSE diff --git a/testsuite/tests/cabal/cabal05/t/Setup.hs b/testsuite/tests/cabal/cabal05/t/Setup.hs new file mode 100644 index 0000000000..9a994af677 --- /dev/null +++ b/testsuite/tests/cabal/cabal05/t/Setup.hs @@ -0,0 +1,2 @@ +import Distribution.Simple +main = defaultMain diff --git a/testsuite/tests/cabal/cabal05/t/T.hs b/testsuite/tests/cabal/cabal05/t/T.hs new file mode 100644 index 0000000000..fcc3fb0479 --- /dev/null +++ b/testsuite/tests/cabal/cabal05/t/T.hs @@ -0,0 +1,3 @@ +module T where + +import Conflict -- should be ambiguous diff --git a/testsuite/tests/cabal/cabal05/t/t.cabal b/testsuite/tests/cabal/cabal05/t/t.cabal new file mode 100644 index 0000000000..10117d6da6 --- /dev/null +++ b/testsuite/tests/cabal/cabal05/t/t.cabal @@ -0,0 +1,11 @@ +name: t +version: 0.1.0.0 +license-file: LICENSE +author: Edward Z. Yang +maintainer: ezyang@cs.stanford.edu +build-type: Simple +cabal-version: >=1.21 + +library + exposed-modules: T + build-depends: base, q, r |