[commit: testsuite] master: Fix safePkg01 on Windows (057f654)
Ian Lynagh
igloo at earth.li
Wed Feb 6 02:10:24 CET 2013
Repository : ssh://darcs.haskell.org//srv/darcs/testsuite
On branch : master
http://hackage.haskell.org/trac/ghc/changeset/057f6541ee47069b04d8fb2198956256c30cea35
>---------------------------------------------------------------
commit 057f6541ee47069b04d8fb2198956256c30cea35
Author: Ian Lynagh <igloo at earth.li>
Date: Tue Feb 5 21:56:27 2013 +0000
Fix safePkg01 on Windows
>---------------------------------------------------------------
tests/safeHaskell/check/pkg01/all.T | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/tests/safeHaskell/check/pkg01/all.T b/tests/safeHaskell/check/pkg01/all.T
index 0f5f202..16f6ba6 100644
--- a/tests/safeHaskell/check/pkg01/all.T
+++ b/tests/safeHaskell/check/pkg01/all.T
@@ -8,6 +8,9 @@ def normaliseArrayPackage(str):
def normaliseBytestringPackage(str):
return re.sub('bytestring-[0-9]+(\.[0-9]+)*', 'bytestring-<VERSION>', str)
+def ignoreLdOutput(str):
+ return re.sub('Creating library file: pdb.safePkg01/dist.build.libHSsafePkg01-1.0-ghc[0-9.]*.dll.a\n', '', str)
+
setTestOpts(f)
if config.have_vanilla:
@@ -31,6 +34,7 @@ make_args = 'VANILLA=' + vanilla + ' PROF=' + prof + ' DYN=' + dyn
# and can be changed correctly
test('safePkg01',
[clean_cmd('$MAKE -s --no-print-directory cleanPackageDatabase.safePkg01'),
+ normalise_errmsg_fun(ignoreLdOutput),
normalise_fun(two_normalisers(normaliseArrayPackage,
normaliseBytestringPackage))],
run_command,
More information about the ghc-commits
mailing list