Fix ghcpkg03, ghcpkg05 (we need to normalise the dynlib names)

5 files changed, 30 insertions, 25 deletions

diff --git a/testsuite/tests/cabal/all.T b/testsuite/tests/cabal/all.T
index 2ec0fa8ff7..f84688cbb5 100644
--- a/testsuite/tests/cabal/all.T
+++ b/testsuite/tests/cabal/all.T
@@ -1,5 +1,8 @@
 setTestOpts(only_compiler_types(['ghc']))
 
+def normaliseDynlibNames(str):
+    return re.sub('-ghc[0-9.]+\.', '-ghc<VERSION>.', str)
+
 test('ghcpkg01',
      extra_clean(['local01.package.conf',
                   'local01.package.conf.old']),
@@ -11,8 +14,9 @@ test('ghcpkg02',
      run_command,
      ['$MAKE -s --no-print-directory ghcpkg02'])
 test('ghcpkg03',
-     extra_clean(['local03.package.conf',
-                  'local03.package.conf.old']),
+     [extra_clean(['local03.package.conf',
+                   'local03.package.conf.old']),
+      normalise_fun(normaliseDynlibNames)],
      run_command,
      ['$MAKE -s --no-print-directory ghcpkg03'])
 test('ghcpkg04',
@@ -32,7 +36,8 @@ test('ghcpkg05',
                     'local05a.package.conf.old',
                     'local05b.package.conf',
                     'local05b.package.conf.old']),
-       normalise_fun(normalise_haddock_junk)
+       normalise_fun(two_normalisers(normalise_haddock_junk,
+                                     normaliseDynlibNames))
        ],
      run_command,
      ['$MAKE -s --no-print-directory ghcpkg05'])
diff --git a/testsuite/tests/cabal/ghcpkg03.stderr b/testsuite/tests/cabal/ghcpkg03.stderr
index 924fc5eb92..05d288dce2 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-ghc7.7.20121025.so","libtestpkg-1.2.3.4-ghc7.7.20121025.dylib","testpkg-1.2.3.4-ghc7.7.20121025.dll"] on library path (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-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-ghc7.7.20121025.so","libtestpkg-2.0-ghc7.7.20121025.dylib","testpkg-2.0-ghc7.7.20121025.dll"] on library path (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-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-ghc7.7.20121025.so","libtestpkg-1.2.3.4-ghc7.7.20121025.dylib","testpkg-1.2.3.4-ghc7.7.20121025.dll"] on library path (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)
diff --git a/testsuite/tests/cabal/ghcpkg03.stderr-mingw32 b/testsuite/tests/cabal/ghcpkg03.stderr-mingw32
index 71ff88a16b..6179867ef9 100644
--- a/testsuite/tests/cabal/ghcpkg03.stderr-mingw32
+++ b/testsuite/tests/cabal/ghcpkg03.stderr-mingw32
@@ -4,28 +4,28 @@ testpkg-1.2.3.4: import-dirs: /usr/local/lib/testpkg is a relative path which ma
 testpkg-1.2.3.4: import-dirs: c:/Program Files/testpkg doesn't exist or isn't a directory (ignoring)
 testpkg-1.2.3.4: library-dirs: /usr/local/lib/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: /usr/local/include/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)
-testpkg-1.2.3.4: cannot find libtestpkg-1.2.3.4.a on library path (ignoring)
+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-2.0: Warning: library-dirs: c:/Program Files/testpkg doesn't exist or isn't a directory
 testpkg-2.0: Warning: include-dirs: c:/Program Files/testpkg doesn't exist or isn't a directory
 testpkg-2.0: import-dirs: /usr/local/lib/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: import-dirs: c:/Program Files/testpkg doesn't exist or isn't a directory (ignoring)
 testpkg-2.0: library-dirs: /usr/local/lib/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: /usr/local/include/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)
-testpkg-2.0: file C\E.hi is missing (ignoring)
-testpkg-2.0: cannot find libtestpkg-2.0.a on library path (ignoring)
+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-ghc7.7.20121031.so","libtestpkg-2.0-ghc7.7.20121031.dylib","testpkg-2.0-ghc7.7.20121031.dll"] on library path (ignoring)
 testpkg-1.2.3.4: Warning: library-dirs: c:/Program Files/testpkg doesn't exist or isn't a directory
 testpkg-1.2.3.4: Warning: include-dirs: c:/Program Files/testpkg doesn't exist or isn't a directory
 testpkg-1.2.3.4: import-dirs: /usr/local/lib/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: import-dirs: c:/Program Files/testpkg doesn't exist or isn't a directory (ignoring)
 testpkg-1.2.3.4: library-dirs: /usr/local/lib/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: /usr/local/include/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)
-testpkg-1.2.3.4: cannot find libtestpkg-1.2.3.4.a on library path (ignoring)
+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-ghc7.7.20121031.so","libtestpkg-1.2.3.4-ghc7.7.20121031.dylib","testpkg-1.2.3.4-ghc7.7.20121031.dll"] on library path (ignoring)
diff --git a/testsuite/tests/cabal/ghcpkg05.stderr b/testsuite/tests/cabal/ghcpkg05.stderr
index 49e3abc3f3..c4e38c16d9 100644
--- a/testsuite/tests/cabal/ghcpkg05.stderr
+++ b/testsuite/tests/cabal/ghcpkg05.stderr
@@ -9,7 +9,7 @@ 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-ghc7.7.20121025.so","libtestpkg-2.0-ghc7.7.20121025.dylib","testpkg-2.0-ghc7.7.20121025.dll"] on library path
+  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
 
 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/ghcpkg05.stderr-mingw32 b/testsuite/tests/cabal/ghcpkg05.stderr-mingw32
index 360783bd78..ac5181679b 100644
--- a/testsuite/tests/cabal/ghcpkg05.stderr-mingw32
+++ b/testsuite/tests/cabal/ghcpkg05.stderr-mingw32
@@ -5,11 +5,11 @@ There are problems in package testpkg-2.0:
   import-dirs: c:/Program Files/testpkg doesn't exist or isn't a directory
   library-dirs: /usr/local/lib/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: /usr/local/include/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
-  file C\E.hi is missing
-  cannot find libtestpkg-2.0.a on library path
+  cannot find any of ["A.hi","A.p_hi","A.dyn_hi"]
+  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
 
 The following packages are broken, either because they have a problem
 listed above, or because they depend on a broken package.