diff options
author | Ian Lynagh <igloo@earth.li> | 2012-06-20 13:21:11 +0100 |
---|---|---|
committer | Ian Lynagh <igloo@earth.li> | 2012-06-20 13:21:11 +0100 |
commit | cd0a88aab2270ac1b25163e1283b1edf2a696ded (patch) | |
tree | bf5df6cfe8fd4facf62de44dd489af338dc28d13 /testsuite/tests/rename | |
parent | de246aad74ed36eaffe4ac519f13818f2aecec5a (diff) | |
download | haskell-cd0a88aab2270ac1b25163e1283b1edf2a696ded.tar.gz |
Update tests following changes in base
Diffstat (limited to 'testsuite/tests/rename')
-rw-r--r-- | testsuite/tests/rename/should_fail/T5281.hs | 6 | ||||
-rw-r--r-- | testsuite/tests/rename/should_fail/T5281.stderr | 7 | ||||
-rw-r--r-- | testsuite/tests/rename/should_fail/T5281A.hs | 7 | ||||
-rw-r--r-- | testsuite/tests/rename/should_fail/all.T | 2 |
4 files changed, 14 insertions, 8 deletions
diff --git a/testsuite/tests/rename/should_fail/T5281.hs b/testsuite/tests/rename/should_fail/T5281.hs index f83e4aec8e..837b0ac6ca 100644 --- a/testsuite/tests/rename/should_fail/T5281.hs +++ b/testsuite/tests/rename/should_fail/T5281.hs @@ -1,8 +1,8 @@ -- The issue here is getting an error message with a decent source location module T5281 where -x = catch -- This use of catch - -- (a) comes from the implicitly imported Prelue - -- (b) this Prelude.catch is deprecated +import T5281A + +x = deprec diff --git a/testsuite/tests/rename/should_fail/T5281.stderr b/testsuite/tests/rename/should_fail/T5281.stderr index c12f4e777c..3fa7670bb6 100644 --- a/testsuite/tests/rename/should_fail/T5281.stderr +++ b/testsuite/tests/rename/should_fail/T5281.stderr @@ -1,5 +1,4 @@ -T5281.hs:4:5: Warning: - In the use of `catch' - (imported from Prelude, but defined in System.IO.Error): - Deprecated: "Please use the new exceptions variant, Control.Exception.catch" +T5281.hs:6:5: Warning: + In the use of `deprec' (imported from T5281A): + Deprecated: "This is deprecated" diff --git a/testsuite/tests/rename/should_fail/T5281A.hs b/testsuite/tests/rename/should_fail/T5281A.hs new file mode 100644 index 0000000000..34ef9b7272 --- /dev/null +++ b/testsuite/tests/rename/should_fail/T5281A.hs @@ -0,0 +1,7 @@ + +module T5281A where + +{-# DEPRECATED deprec "This is deprecated" #-} +deprec :: Int +deprec = 5 + diff --git a/testsuite/tests/rename/should_fail/all.T b/testsuite/tests/rename/should_fail/all.T index bad0d8330c..168d65748e 100644 --- a/testsuite/tests/rename/should_fail/all.T +++ b/testsuite/tests/rename/should_fail/all.T @@ -82,7 +82,7 @@ test('mc13', normal, compile_fail, ['']) test('mc14', normal, compile_fail, ['']) test('T5211', normal, compile, ['']) # Warnings only test('T1595a', normal, compile_fail, ['']) -test('T5281', normal, compile, ['']) # Warnings only +test('T5281', normal, multimod_compile, ['T5281', '-v0']) # Warnings only test('T5372', extra_clean(['T5372a.hi', 'T5372a.o']), multimod_compile_fail, |