[commit: testsuite] master: Accept changed output for a couple ghc-pkg tests (588d371)

[Duncan Coutts]

Repository : ssh://darcs.haskell.org//srv/darcs/testsuite

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/588d371db5a91e5fcb9f1c14f80ae74e11d4caff

>---------------------------------------------------------------

commit 588d371db5a91e5fcb9f1c14f80ae74e11d4caff
Author: Duncan Coutts <duncan at well-typed.com>
Date:   Wed May 25 12:10:50 2011 +0100

    Accept changed output for a couple ghc-pkg tests
    
    New longer error message.

>---------------------------------------------------------------

 tests/ghc-regress/cabal/ghcpkg03.stderr |   18 +++++++++---------
 tests/ghc-regress/cabal/ghcpkg05.stderr |    6 +++---
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/tests/ghc-regress/cabal/ghcpkg03.stderr b/tests/ghc-regress/cabal/ghcpkg03.stderr
index ceec24d..f30d7fd 100644
--- a/tests/ghc-regress/cabal/ghcpkg03.stderr
+++ b/tests/ghc-regress/cabal/ghcpkg03.stderr
@@ -1,9 +1,9 @@
 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)
-testpkg-1.2.3.4: import-dirs: c:/Program Files/testpkg is a relative path (ignoring)
-testpkg-1.2.3.4: library-dirs: c:/Program Files/testpkg is a relative path (ignoring)
-testpkg-1.2.3.4: include-dirs: c:/Program Files/testpkg is a relative path (ignoring)
+testpkg-1.2.3.4: import-dirs: c:/Program Files/testpkg is a relative path which makes no sense (as there is nothing for it to be relative to). You can make paths relative to the package database itself by using ${pkgroot}. (ignoring)
+testpkg-1.2.3.4: library-dirs: c:/Program Files/testpkg is a relative path which makes no sense (as there is nothing for it to be relative to). You can make paths relative to the package database itself by using ${pkgroot}. (ignoring)
+testpkg-1.2.3.4: include-dirs: c:/Program Files/testpkg is a relative path which makes no sense (as there is nothing for it to be relative to). You can make paths relative to the package database itself by using ${pkgroot}. (ignoring)
 testpkg-1.2.3.4: file A.hi is missing (ignoring)
 testpkg-1.2.3.4: file B.hi is missing (ignoring)
 testpkg-1.2.3.4: file C/D.hi is missing (ignoring)
@@ -11,9 +11,9 @@ testpkg-1.2.3.4: cannot find libtestpkg-1.2.3.4.a 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)
-testpkg-2.0: import-dirs: c:/Program Files/testpkg is a relative path (ignoring)
-testpkg-2.0: library-dirs: c:/Program Files/testpkg is a relative path (ignoring)
-testpkg-2.0: include-dirs: c:/Program Files/testpkg is a relative path (ignoring)
+testpkg-2.0: import-dirs: c:/Program Files/testpkg is a relative path which makes no sense (as there is nothing for it to be relative to). You can make paths relative to the package database itself by using ${pkgroot}. (ignoring)
+testpkg-2.0: library-dirs: c:/Program Files/testpkg is a relative path which makes no sense (as there is nothing for it to be relative to). You can make paths relative to the package database itself by using ${pkgroot}. (ignoring)
+testpkg-2.0: include-dirs: c:/Program Files/testpkg is a relative path which makes no sense (as there is nothing for it to be relative to). You can make paths relative to the package database itself by using ${pkgroot}. (ignoring)
 testpkg-2.0: file A.hi is missing (ignoring)
 testpkg-2.0: file B.hi is missing (ignoring)
 testpkg-2.0: file C/D.hi is missing (ignoring)
@@ -22,9 +22,9 @@ testpkg-2.0: cannot find libtestpkg-2.0.a 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)
-testpkg-1.2.3.4: import-dirs: c:/Program Files/testpkg is a relative path (ignoring)
-testpkg-1.2.3.4: library-dirs: c:/Program Files/testpkg is a relative path (ignoring)
-testpkg-1.2.3.4: include-dirs: c:/Program Files/testpkg is a relative path (ignoring)
+testpkg-1.2.3.4: import-dirs: c:/Program Files/testpkg is a relative path which makes no sense (as there is nothing for it to be relative to). You can make paths relative to the package database itself by using ${pkgroot}. (ignoring)
+testpkg-1.2.3.4: library-dirs: c:/Program Files/testpkg is a relative path which makes no sense (as there is nothing for it to be relative to). You can make paths relative to the package database itself by using ${pkgroot}. (ignoring)
+testpkg-1.2.3.4: include-dirs: c:/Program Files/testpkg is a relative path which makes no sense (as there is nothing for it to be relative to). You can make paths relative to the package database itself by using ${pkgroot}. (ignoring)
 testpkg-1.2.3.4: file A.hi is missing (ignoring)
 testpkg-1.2.3.4: file B.hi is missing (ignoring)
 testpkg-1.2.3.4: file C/D.hi is missing (ignoring)
diff --git a/tests/ghc-regress/cabal/ghcpkg05.stderr b/tests/ghc-regress/cabal/ghcpkg05.stderr
index 6e470f7..5d30ba0 100644
--- a/tests/ghc-regress/cabal/ghcpkg05.stderr
+++ b/tests/ghc-regress/cabal/ghcpkg05.stderr
@@ -2,9 +2,9 @@ There are problems in package testpkg-2.0:
   Warning: library-dirs: /usr/local/lib/testpkg doesn't exist or isn't a directory
   Warning: include-dirs: /usr/local/include/testpkg doesn't exist or isn't a directory
   import-dirs: /usr/local/lib/testpkg doesn't exist or isn't a directory
-  import-dirs: c:/Program Files/testpkg is a relative path
-  library-dirs: c:/Program Files/testpkg is a relative path
-  include-dirs: c:/Program Files/testpkg is a relative path
+  import-dirs: c:/Program Files/testpkg is a relative path which makes no sense (as there is nothing for it to be relative to). You can make paths relative to the package database itself by using ${pkgroot}.
+  library-dirs: c:/Program Files/testpkg is a relative path which makes no sense (as there is nothing for it to be relative to). You can make paths relative to the package database itself by using ${pkgroot}.
+  include-dirs: c:/Program Files/testpkg is a relative path which makes no sense (as there is nothing for it to be relative to). You can make paths relative to the package database itself by using ${pkgroot}.
   file A.hi is missing
   file B.hi is missing
   file C/D.hi is missing