[project @ 2005-08-02 16:04:23 by simonmar]

update test

testsuite/tests/ghc-regress/cabal/Makefile

@@ -68,9 +68,9 @@ ghcpkg04 :
 	@rm -f $(PKGCONF)
 	@echo "[]" >$(PKGCONF)
 	@$(GHC_PKG) register --force test.pkg >/dev/null 2>&1 
-	@$(GHC_PKG) register --force test2.pkg >/dev/null 2>&1 
-	@$(GHC_PKG) expose testpkg-2.0  >/dev/null 2>&1
-	@: # we now have testpkg-1.2.3.4 and testpkg-2.0 both exposed
+	@$(GHC_PKG) update --force test5.pkg >/dev/null 2>&1 
+	@$(GHC_PKG) expose testpkg-1.2.3.4  >/dev/null 2>&1
+	@: # testpkg-1.2.3.4 and newtestpkg-2.0 are both exposed now
 	@$(TEST_HC) -package-conf $(PKGCONF) -c ghcpkg04.hs || true
 
 # -----------------------------------------------------------------------------

testsuite/tests/ghc-regress/cabal/ghcpkg04.stderr

@@ -2,4 +2,4 @@
 ghcpkg04.hs:1:0:
     Failed to load interface for `A':
 	Cannot import `A':
-	  it was found in multiple packages: testpkg-2.0 testpkg-1.2.3.4
+	  it was found in multiple packages: testpkg-1.2.3.4 newtestpkg-2.0

testsuite/tests/ghc-regress/cabal/test5.pkg

+name: "newtestpkg"
+version: 2.0
+license: BSD3
+copyright: (c) The Univsersity of Glasgow 2004
+maintainer: glasgow-haskell-users@haskell.org
+stability: unstable
+homepage: http://www.haskell.org/ghc
+package-url: http://www.haskell.org/ghc
+description: A Test Package (new version)
+category: none
+author: simonmar@microsoft.com
+exposed: True
+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
+depends: base-1.0, haskell-src, Cabal