summaryrefslogtreecommitdiff
path: root/testsuite/tests/mdo
diff options
context:
space:
mode:
authorSimon Peyton Jones <simonpj@microsoft.com>2012-06-12 08:38:24 +0100
committerSimon Peyton Jones <simonpj@microsoft.com>2012-06-12 08:38:24 +0100
commitc5c9026dbf56002130a957f79ebded34e3ae8f29 (patch)
treed460940404b4c65a164a3a0788a931c430f5ed3f /testsuite/tests/mdo
parentba5c1e9d7ee5bc6079b86fd39ef834081e77345d (diff)
downloadhaskell-c5c9026dbf56002130a957f79ebded34e3ae8f29.tar.gz
Update test output for mdo changes (Trac #4148)
Diffstat (limited to 'testsuite/tests/mdo')
-rw-r--r--testsuite/tests/mdo/should_compile/mdo006.stderr3
-rw-r--r--testsuite/tests/mdo/should_fail/all.T1
-rw-r--r--testsuite/tests/mdo/should_fail/mdofail001.stderr3
-rw-r--r--testsuite/tests/mdo/should_fail/mdofail002.stderr3
-rw-r--r--testsuite/tests/mdo/should_fail/mdofail003.stderr3
-rw-r--r--testsuite/tests/mdo/should_fail/mdofail004.stderr3
-rw-r--r--testsuite/tests/mdo/should_run/all.T2
7 files changed, 3 insertions, 15 deletions
diff --git a/testsuite/tests/mdo/should_compile/mdo006.stderr b/testsuite/tests/mdo/should_compile/mdo006.stderr
deleted file mode 100644
index 218ba444b8..0000000000
--- a/testsuite/tests/mdo/should_compile/mdo006.stderr
+++ /dev/null
@@ -1,3 +0,0 @@
-
-mdo006.hs:1:12:
- Warning: -XRecursiveDo is deprecated: use -XDoRec or pragma {-# LANGUAGE DoRec #-} instead
diff --git a/testsuite/tests/mdo/should_fail/all.T b/testsuite/tests/mdo/should_fail/all.T
index 6693587bab..667a538ce1 100644
--- a/testsuite/tests/mdo/should_fail/all.T
+++ b/testsuite/tests/mdo/should_fail/all.T
@@ -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, [''])
diff --git a/testsuite/tests/mdo/should_fail/mdofail001.stderr b/testsuite/tests/mdo/should_fail/mdofail001.stderr
index f9516ad2b0..e20d82ad49 100644
--- a/testsuite/tests/mdo/should_fail/mdofail001.stderr
+++ b/testsuite/tests/mdo/should_fail/mdofail001.stderr
@@ -1,7 +1,4 @@
-mdofail001.hs:1:12:
- Warning: -XRecursiveDo is deprecated: use -XDoRec or pragma {-# LANGUAGE DoRec #-} instead
-
mdofail001.hs:10:32:
No instance for (Num Char)
arising from the literal `1'
diff --git a/testsuite/tests/mdo/should_fail/mdofail002.stderr b/testsuite/tests/mdo/should_fail/mdofail002.stderr
index 4da766311e..a1327c6dfd 100644
--- a/testsuite/tests/mdo/should_fail/mdofail002.stderr
+++ b/testsuite/tests/mdo/should_fail/mdofail002.stderr
@@ -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
diff --git a/testsuite/tests/mdo/should_fail/mdofail003.stderr b/testsuite/tests/mdo/should_fail/mdofail003.stderr
index fceb7d2b82..e093fe0a75 100644
--- a/testsuite/tests/mdo/should_fail/mdofail003.stderr
+++ b/testsuite/tests/mdo/should_fail/mdofail003.stderr
@@ -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
index 7a96d65197..0000000000
--- a/testsuite/tests/mdo/should_fail/mdofail004.stderr
+++ /dev/null
@@ -1,3 +0,0 @@
-
-mdofail004.hs:1:12:
- Warning: -XRecursiveDo is deprecated: use -XDoRec or pragma {-# LANGUAGE DoRec #-} instead
diff --git a/testsuite/tests/mdo/should_run/all.T b/testsuite/tests/mdo/should_run/all.T
index 53730bebe6..3c952228a7 100644
--- a/testsuite/tests/mdo/should_run/all.T
+++ b/testsuite/tests/mdo/should_run/all.T
@@ -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, [''])