Commit 5527c5bb authored by ian@well-typed.com's avatar ian@well-typed.com
Browse files

Use normalise_errmsg_fun rather than normalise_fun where appropriate

parent 8a0eeb40
...@@ -16,7 +16,7 @@ test('ghcpkg02', ...@@ -16,7 +16,7 @@ test('ghcpkg02',
test('ghcpkg03', test('ghcpkg03',
[extra_clean(['local03.package.conf', [extra_clean(['local03.package.conf',
'local03.package.conf.old']), 'local03.package.conf.old']),
normalise_fun(normaliseDynlibNames)], normalise_errmsg_fun(normaliseDynlibNames)],
run_command, run_command,
['$MAKE -s --no-print-directory ghcpkg03']) ['$MAKE -s --no-print-directory ghcpkg03'])
test('ghcpkg04', test('ghcpkg04',
...@@ -36,8 +36,8 @@ test('ghcpkg05', ...@@ -36,8 +36,8 @@ test('ghcpkg05',
'local05a.package.conf.old', 'local05a.package.conf.old',
'local05b.package.conf', 'local05b.package.conf',
'local05b.package.conf.old']), 'local05b.package.conf.old']),
normalise_fun(two_normalisers(normalise_haddock_junk, normalise_errmsg_fun(two_normalisers(normalise_haddock_junk,
normaliseDynlibNames)) normaliseDynlibNames))
], ],
run_command, run_command,
['$MAKE -s --no-print-directory ghcpkg05']) ['$MAKE -s --no-print-directory ghcpkg05'])
......
...@@ -5,7 +5,7 @@ def normaliseBytestringPackage(str): ...@@ -5,7 +5,7 @@ def normaliseBytestringPackage(str):
test('p1', normal, ghci_script, ['p1.script']) test('p1', normal, ghci_script, ['p1.script'])
test('p2', normal, ghci_script, ['p2.script']) test('p2', normal, ghci_script, ['p2.script'])
test('p3', normalise_fun(normaliseBytestringPackage), test('p3', normalise_errmsg_fun(normaliseBytestringPackage),
ghci_script, ['p3.script']) ghci_script, ['p3.script'])
test('p4', normal, ghci_script, ['p4.script']) test('p4', normal, ghci_script, ['p4.script'])
test('p5', normal, ghci_script, ['p5.script']) test('p5', normal, ghci_script, ['p5.script'])
...@@ -15,13 +15,13 @@ test('p8', normal, ghci_script, ['p8.script']) ...@@ -15,13 +15,13 @@ test('p8', normal, ghci_script, ['p8.script'])
test('p9', normal, ghci_script, ['p9.script']) test('p9', normal, ghci_script, ['p9.script'])
test('p10', normal, ghci_script, ['p10.script']) test('p10', normal, ghci_script, ['p10.script'])
test('p11', normal, ghci_script, ['p11.script']) test('p11', normal, ghci_script, ['p11.script'])
test('p12', normalise_fun(normaliseBytestringPackage), test('p12', normalise_errmsg_fun(normaliseBytestringPackage),
ghci_script, ['p12.script']) ghci_script, ['p12.script'])
test('p13', normal, ghci_script, ['p13.script']) test('p13', normal, ghci_script, ['p13.script'])
test('p14', normal, ghci_script, ['p14.script']) test('p14', normal, ghci_script, ['p14.script'])
test('p15', normal, ghci_script, ['p15.script']) test('p15', normal, ghci_script, ['p15.script'])
test('p16', normal, ghci_script, ['p16.script']) test('p16', normal, ghci_script, ['p16.script'])
test('p17', normalise_fun(normaliseBytestringPackage), test('p17', normalise_errmsg_fun(normaliseBytestringPackage),
ghci_script, ['p17.script']) ghci_script, ['p17.script'])
# 7172 # 7172
test('p18', normalise_fun(normaliseBytestringPackage), test('p18', normalise_fun(normaliseBytestringPackage),
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment