Adapt tests to the removal of the MR in GHCi

16 files changed, 22 insertions, 21 deletions

diff --git a/testsuite/tests/ghci.debugger/scripts/2740.script b/testsuite/tests/ghci.debugger/scripts/2740.script
index 8cf8c3909b..ac45616180 100644
--- a/testsuite/tests/ghci.debugger/scripts/2740.script
+++ b/testsuite/tests/ghci.debugger/scripts/2740.script
@@ -1,3 +1,4 @@
+:seti -XMonomorphismRestriction
 :l 2740.hs
 :step f 1 2 3
 :step
diff --git a/testsuite/tests/ghci.debugger/scripts/break001.script b/testsuite/tests/ghci.debugger/scripts/break001.script
index 63b5e71a5f..ec02c70dcc 100644
--- a/testsuite/tests/ghci.debugger/scripts/break001.script
+++ b/testsuite/tests/ghci.debugger/scripts/break001.script
@@ -1,7 +1,7 @@
 :l ../Test2
 :b 3
 :b 5
-f 1
+f (1 :: Integer)
 :st
 :st
 :st
diff --git a/testsuite/tests/ghci.debugger/scripts/break005.script b/testsuite/tests/ghci.debugger/scripts/break005.script
index b36ebbca2a..c6fec5e019 100644
--- a/testsuite/tests/ghci.debugger/scripts/break005.script
+++ b/testsuite/tests/ghci.debugger/scripts/break005.script
@@ -1,5 +1,5 @@
 :l ../QSort
-:st qsort [1,2]
+:st qsort [1::Integer,2]
 :step
 seq left ()
 :print left
diff --git a/testsuite/tests/ghci.debugger/scripts/break006.script b/testsuite/tests/ghci.debugger/scripts/break006.script
index 7381490f69..38cd1e14ba 100644
--- a/testsuite/tests/ghci.debugger/scripts/break006.script
+++ b/testsuite/tests/ghci.debugger/scripts/break006.script
@@ -1,5 +1,5 @@
 :l ../Test3.hs
-:st mymap (+1) [1,2,3]
+:st mymap (+1) [1::Integer,2,3]
 :st
 :show bindings
 f x -- should fail, unknown return type
diff --git a/testsuite/tests/ghci.debugger/scripts/break026.script b/testsuite/tests/ghci.debugger/scripts/break026.script
index 98c6624751..b2dd79ef97 100644
--- a/testsuite/tests/ghci.debugger/scripts/break026.script
+++ b/testsuite/tests/ghci.debugger/scripts/break026.script
@@ -1,5 +1,5 @@
 :load break026
-:step foldl (+) 0 [1..5]
+:step foldl (+) 0 [1::Integer .. 5]
 :step
 :step
 :step
@@ -9,7 +9,7 @@
         -- answer should be 1
 
 :load break026
-:step foldl (+) 0 [1..5]
+:step foldl (+) 0 [1::Integer .. 5]
 :step
 :step
 :step
diff --git a/testsuite/tests/ghci.debugger/scripts/break027.script b/testsuite/tests/ghci.debugger/scripts/break027.script
index 198b259c78..5c5a5f9c65 100644
--- a/testsuite/tests/ghci.debugger/scripts/break027.script
+++ b/testsuite/tests/ghci.debugger/scripts/break027.script
@@ -1,5 +1,5 @@
 :l ../QSort
 :break qsort
-qsort [3,2,1]
+qsort [3::Integer,2,1]
 :step
 :i a
diff --git a/testsuite/tests/ghci.debugger/scripts/print001.script b/testsuite/tests/ghci.debugger/scripts/print001.script
index f2111c0cc5..bdb2098c0f 100644
--- a/testsuite/tests/ghci.debugger/scripts/print001.script
+++ b/testsuite/tests/ghci.debugger/scripts/print001.script
@@ -1,6 +1,6 @@
 -- Printing of lists
 
-let li = map Just [0..5]
+let li = map Just [0::Integer .. 5]
 :p li
 head li
 :p li
@@ -9,4 +9,4 @@ length li
 :sp li
 li
 :p li
-:sp li
\ No newline at end of file
+:sp li
diff --git a/testsuite/tests/ghci.debugger/scripts/print004.script b/testsuite/tests/ghci.debugger/scripts/print004.script
index b82929a600..78039d8e0f 100644
--- a/testsuite/tests/ghci.debugger/scripts/print004.script
+++ b/testsuite/tests/ghci.debugger/scripts/print004.script
@@ -4,7 +4,7 @@ let a = False
 :sp a 
 :p a
 
-let b = map Just [1..4]
+let b = map Just [1::Integer .. 4]
 :p b
 head b
 :p b
diff --git a/testsuite/tests/ghci.debugger/scripts/print005.script b/testsuite/tests/ghci.debugger/scripts/print005.script
index 0d26508703..f08b7752a3 100644
--- a/testsuite/tests/ghci.debugger/scripts/print005.script
+++ b/testsuite/tests/ghci.debugger/scripts/print005.script
@@ -2,7 +2,7 @@
 
 :l ../QSort
 :break 5
-qsort [8, 4]
+qsort [8::Integer, 4]
 
 :p right
 seq right ()
@@ -12,4 +12,4 @@ seq left ()
 :p left
 length left
 :p left
-:continue
\ No newline at end of file
+:continue
diff --git a/testsuite/tests/ghci.debugger/scripts/print009.script b/testsuite/tests/ghci.debugger/scripts/print009.script
index 9c36e8c403..38258ace58 100644
--- a/testsuite/tests/ghci.debugger/scripts/print009.script
+++ b/testsuite/tests/ghci.debugger/scripts/print009.script
@@ -2,7 +2,7 @@
 -- Testing collisions
 
 let _t1 = "user value"
-let li = map Just [1..4]
+let li = map Just [1::Integer .. 4]
 :p li
 _t1
-_t2
\ No newline at end of file
+_t2
diff --git a/testsuite/tests/ghci.debugger/scripts/print013.script b/testsuite/tests/ghci.debugger/scripts/print013.script
index 154c1b328f..334e6050ca 100644
--- a/testsuite/tests/ghci.debugger/scripts/print013.script
+++ b/testsuite/tests/ghci.debugger/scripts/print013.script
@@ -3,7 +3,7 @@
 :set -XGADTs -XRank2Types
 :l ../GADT
 
-let d = DictN 1
+let d = DictN (1 :: Integer)
 :p d
 seq _t1 ()
 :p d
diff --git a/testsuite/tests/ghci.debugger/scripts/print016.script b/testsuite/tests/ghci.debugger/scripts/print016.script
index 1f5f153892..aa5cb048bd 100644
--- a/testsuite/tests/ghci.debugger/scripts/print016.script
+++ b/testsuite/tests/ghci.debugger/scripts/print016.script
@@ -2,9 +2,9 @@
 
 :set -XExistentialQuantification -XDeriveDataTypeable -XGeneralizedNewtypeDeriving
 :l ../Test
-let a = map MkT [1..2]
+let a = map MkT [1::Integer .. 2]
 :p a
 seq _t1 ()
 :p a
 seq _t2 ()
-:p a
\ No newline at end of file
+:p a
diff --git a/testsuite/tests/ghci.debugger/scripts/print017.script b/testsuite/tests/ghci.debugger/scripts/print017.script
index 7a8371a2c1..d049ffd1dd 100644
--- a/testsuite/tests/ghci.debugger/scripts/print017.script
+++ b/testsuite/tests/ghci.debugger/scripts/print017.script
@@ -2,7 +2,7 @@
 
 :set -XExistentialQuantification -XDeriveDataTypeable -XGeneralizedNewtypeDeriving
 :l ../Test
-let a = map (MkT2 . MkT) [1..2]
+let a = map (MkT2 . MkT) [1::Integer .. 2]
 :p a
 seq _t1 ()
 :p a
diff --git a/testsuite/tests/ghci.debugger/scripts/print023.script b/testsuite/tests/ghci.debugger/scripts/print023.script
index 434b8df4af..95f37ff18d 100644
--- a/testsuite/tests/ghci.debugger/scripts/print023.script
+++ b/testsuite/tests/ghci.debugger/scripts/print023.script
@@ -3,6 +3,6 @@
 :set -XExistentialQuantification -XDeriveDataTypeable -XGeneralizedNewtypeDeriving
 :l ../Test
 
-let a = MkT [1..2]
+let a = MkT [1::Integer .. 2]
 seq a ()
 :p a
diff --git a/testsuite/tests/ghci.debugger/scripts/print024.script b/testsuite/tests/ghci.debugger/scripts/print024.script
index d617ecaaa0..381676e0d7 100644
--- a/testsuite/tests/ghci.debugger/scripts/print024.script
+++ b/testsuite/tests/ghci.debugger/scripts/print024.script
@@ -3,7 +3,7 @@
 :set -XExistentialQuantification -XDeriveDataTypeable -XGeneralizedNewtypeDeriving
 :l ../Test
 
-let a = MkT 1
+let a = MkT (1 :: Integer)
 seq a ()
 :p a
 a
diff --git a/testsuite/tests/ghci.debugger/scripts/print028.script b/testsuite/tests/ghci.debugger/scripts/print028.script
index 0beb8bf725..dac9816370 100644
--- a/testsuite/tests/ghci.debugger/scripts/print028.script
+++ b/testsuite/tests/ghci.debugger/scripts/print028.script
@@ -1,8 +1,8 @@
 :m + Data.IORef
 
-let l = map Just [1..10]
+let l = map Just [1::Integer .. 10]
 :p l
 head l
 r <- newIORef l
 :p r
-:sp r
\ No newline at end of file
+:sp r