Update test output for mdo changes (Trac #4148)
authorSimon Peyton Jones <simonpj@microsoft.com>
Tue, 12 Jun 2012 07:38:24 +0000 (08:38 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Tue, 12 Jun 2012 07:38:24 +0000 (08:38 +0100)
16 files changed:
testsuite/tests/arrows/should_fail/T2111.hs
testsuite/tests/arrows/should_fail/T2111.stderr
testsuite/tests/deSugar/should_compile/T3263-1.stderr
testsuite/tests/deSugar/should_compile/T3263-2.stderr
testsuite/tests/ghci.debugger/scripts/break018.stderr [deleted file]
testsuite/tests/ghci.debugger/scripts/dynbrk004.stderr [deleted file]
testsuite/tests/mdo/should_compile/mdo006.stderr [deleted file]
testsuite/tests/mdo/should_fail/all.T
testsuite/tests/mdo/should_fail/mdofail001.stderr
testsuite/tests/mdo/should_fail/mdofail002.stderr
testsuite/tests/mdo/should_fail/mdofail003.stderr
testsuite/tests/mdo/should_fail/mdofail004.stderr [deleted file]
testsuite/tests/mdo/should_run/all.T
testsuite/tests/parser/should_compile/read058.stderr [deleted file]
testsuite/tests/parser/should_compile/read059.stderr [deleted file]
testsuite/tests/typecheck/should_compile/T4404.hs

index eb242cd..352afe2 100644 (file)
@@ -1,4 +1,4 @@
-{-# OPTIONS_GHC -XArrows -XDoRec -XRecursiveDo#-}
+{-# OPTIONS_GHC -XArrows -XRecursiveDo#-}
 -- Test Trac #2111
 
 module Foo where
index 9c6c17f..73f5dad 100644 (file)
@@ -1,7 +1,4 @@
 
-T2111.hs:1:16:
-    Warning: -XRecursiveDo is deprecated: use -XDoRec or pragma {-# LANGUAGE DoRec #-} instead
-
 T2111.hs:6:23:
     The arrow command
       undefined -< x
index ac21515..6f3a280 100644 (file)
@@ -1,7 +1,4 @@
 
-on the commandline:
-    Warning: -XRecursiveDo is deprecated: use -XDoRec or pragma {-# LANGUAGE DoRec #-} instead
-
 T3263-1.hs:25:3:
     Warning: A do-notation statement discarded a result of type Int.
              Suppress this warning by saying "_ <- nonNullM",
index 3f92403..6caae87 100644 (file)
@@ -1,7 +1,4 @@
 
-on the commandline:
-    Warning: -XRecursiveDo is deprecated: use -XDoRec or pragma {-# LANGUAGE DoRec #-} instead
-
 T3263-2.hs:25:3:
     Warning: A do-notation statement discarded a result of type m Int.
              Suppress this warning by saying "_ <- return (return 10 :: m Int)",
diff --git a/testsuite/tests/ghci.debugger/scripts/break018.stderr b/testsuite/tests/ghci.debugger/scripts/break018.stderr
deleted file mode 100644 (file)
index d0bb1e0..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-
-<no location info>: Warning:
-    -XRecursiveDo is deprecated: use -XDoRec or pragma {-# LANGUAGE DoRec #-} instead
diff --git a/testsuite/tests/ghci.debugger/scripts/dynbrk004.stderr b/testsuite/tests/ghci.debugger/scripts/dynbrk004.stderr
deleted file mode 100644 (file)
index d0bb1e0..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-
-<no location info>: Warning:
-    -XRecursiveDo is deprecated: use -XDoRec or pragma {-# LANGUAGE DoRec #-} instead
diff --git a/testsuite/tests/mdo/should_compile/mdo006.stderr b/testsuite/tests/mdo/should_compile/mdo006.stderr
deleted file mode 100644 (file)
index 218ba44..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-
-mdo006.hs:1:12:
-    Warning: -XRecursiveDo is deprecated: use -XDoRec or pragma {-# LANGUAGE DoRec #-} instead
index 6693587..667a538 100644 (file)
@@ -5,3 +5,4 @@ test('mdofail002', normal, compile_fail, [''])
 test('mdofail003', normal, compile_fail, [''])
 test('mdofail004', normal, compile, [''])
 test('mdofail005', normal, compile_fail, [''])
+test('mdofail006', exit_code(1), compile_and_run, [''])
index f9516ad..e20d82a 100644 (file)
@@ -1,7 +1,4 @@
 \r
-mdofail001.hs:1:12:\r
-    Warning: -XRecursiveDo is deprecated: use -XDoRec or pragma {-# LANGUAGE DoRec #-} instead\r
-\r
 mdofail001.hs:10:32:\r
     No instance for (Num Char)\r
       arising from the literal `1'\r
index 4da7663..a1327c6 100644 (file)
@@ -1,7 +1,4 @@
 
-mdofail002.hs:1:12:
-    Warning: -XRecursiveDo is deprecated: use -XDoRec or pragma {-# LANGUAGE DoRec #-} instead
-
 mdofail002.hs:10:9:
     Conflicting definitions for `x'
     Bound at: mdofail002.hs:10:9
index fceb7d2..e093fe0 100644 (file)
@@ -1,7 +1,4 @@
 
-mdofail003.hs:1:12:
-    Warning: -XRecursiveDo is deprecated: use -XDoRec or pragma {-# LANGUAGE DoRec #-} instead
-
 mdofail003.hs:10:9:
     Conflicting definitions for `x'
     Bound at: mdofail003.hs:10:9
diff --git a/testsuite/tests/mdo/should_fail/mdofail004.stderr b/testsuite/tests/mdo/should_fail/mdofail004.stderr
deleted file mode 100644 (file)
index 7a96d65..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-
-mdofail004.hs:1:12:
-    Warning: -XRecursiveDo is deprecated: use -XDoRec or pragma {-# LANGUAGE DoRec #-} instead
index 53730be..3c95222 100644 (file)
@@ -3,3 +3,5 @@ setTestOpts(only_ways(['normal']));
 test('mdorun001', normal, compile_and_run, [''])
 test('mdorun002', normal, compile_and_run, [''])
 test('mdorun003', normal, compile_and_run, [''])
+test('mdorun004', normal, compile_and_run, [''])
+test('mdorun005', normal, compile_and_run, [''])
diff --git a/testsuite/tests/parser/should_compile/read058.stderr b/testsuite/tests/parser/should_compile/read058.stderr
deleted file mode 100644 (file)
index aa42286..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-
-read058.hs:2:16:
-    Warning: -XRecursiveDo is deprecated: use -XDoRec or pragma {-# LANGUAGE DoRec #-} instead
diff --git a/testsuite/tests/parser/should_compile/read059.stderr b/testsuite/tests/parser/should_compile/read059.stderr
deleted file mode 100644 (file)
index 5d2ae6c..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-
-read059.hs:2:14:
-    Warning: -XRecursiveDo is deprecated: use -XDoRec or pragma {-# LANGUAGE DoRec #-} instead
index 8940665..1b46a15 100644 (file)
@@ -1,4 +1,4 @@
-{-# LANGUAGE RecordWildCards, DoRec #-}
+{-# LANGUAGE RecordWildCards, RecursiveDo #-}
 
 module TT where