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

On branch  : ghc-7.6

http://hackage.haskell.org/trac/ghc/changeset/9dfc0031e390b46f1c1c2359fea896a441e286da

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

commit 9dfc0031e390b46f1c1c2359fea896a441e286da
Author: Ian Lynagh <i...@well-typed.com>
Date:   Sat Nov 17 02:03:38 2012 +0000

    Fix some tests
    
    They were depending on the exact bytestring version

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

 tests/safeHaskell/ghci/all.T |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/tests/safeHaskell/ghci/all.T b/tests/safeHaskell/ghci/all.T
index 937dcd8..16be5e5 100644
--- a/tests/safeHaskell/ghci/all.T
+++ b/tests/safeHaskell/ghci/all.T
@@ -1,8 +1,12 @@
 # Test GHCi works with Safe Haskell
 
+def normaliseBytestringPackage(str):
+    return re.sub('bytestring-[0-9.]+', 'bytestring-<VERSION>.', str)
+
 test('p1', normal, ghci_script, ['p1.script'])
 test('p2', normal, ghci_script, ['p2.script'])
-test('p3', normal, ghci_script, ['p3.script'])
+test('p3', normalise_fun(normaliseBytestringPackage),
+           ghci_script, ['p3.script'])
 test('p4', normal, ghci_script, ['p4.script'])
 test('p5', normal, ghci_script, ['p5.script'])
 test('p6', normal, ghci_script, ['p6.script'])
@@ -11,12 +15,15 @@ test('p8', normal, ghci_script, ['p8.script'])
 test('p9', normal, ghci_script, ['p9.script'])
 test('p10', normal, ghci_script, ['p10.script'])
 test('p11', normal, ghci_script, ['p11.script'])
-test('p12', normal, ghci_script, ['p12.script'])
+test('p12', normalise_fun(normaliseBytestringPackage),
+            ghci_script, ['p12.script'])
 test('p13', normal, ghci_script, ['p13.script'])
 test('p14', normal, ghci_script, ['p14.script'])
 test('p15', normal, ghci_script, ['p15.script'])
 test('p16', normal, ghci_script, ['p16.script'])
-test('p17', normal, ghci_script, ['p17.script'])
+test('p17', normalise_fun(normaliseBytestringPackage),
+            ghci_script, ['p17.script'])
 # 7172
-test('p18', normal, ghci_script, ['p18.script'])
+test('p18', normalise_fun(normaliseBytestringPackage),
+            ghci_script, ['p18.script'])
 



_______________________________________________
Cvs-ghc mailing list
Cvs-ghc@haskell.org
http://www.haskell.org/mailman/listinfo/cvs-ghc

Reply via email to