summaryrefslogtreecommitdiff
path: root/testsuite/tests/deriving
diff options
context:
space:
mode:
authorAustin Seipp <austin@well-typed.com>2015-09-23 03:35:05 -0500
committerAustin Seipp <austin@well-typed.com>2015-09-23 03:35:54 -0500
commit79f57325dca4d1ce4601d01c4fab50f7bcfc9b9b (patch)
tree655e78aa5865e7f5102d6e2ed3581d39f6c85469 /testsuite/tests/deriving
parent4cdab73f084fda8ea0538908f8d266c800a8b586 (diff)
downloadhaskell-79f57325dca4d1ce4601d01c4fab50f7bcfc9b9b.tar.gz
testsuite: attempt fixing fallout from 089b72f52
A few tests had the same name which is a big no-no, so I reorganized them a little. The naming is somewhat haphazard, though... Signed-off-by: Austin Seipp <austin@well-typed.com>
Diffstat (limited to 'testsuite/tests/deriving')
-rw-r--r--testsuite/tests/deriving/should_compile/T1830_2.hs (renamed from testsuite/tests/deriving/should_compile/T1830.hs)2
-rw-r--r--testsuite/tests/deriving/should_compile/all.T2
-rw-r--r--testsuite/tests/deriving/should_fail/T1830_1.hs (renamed from testsuite/tests/deriving/should_fail/T1830.hs)2
-rw-r--r--testsuite/tests/deriving/should_fail/T1830_1.stderr (renamed from testsuite/tests/deriving/should_fail/T1830.stderr)2
-rw-r--r--testsuite/tests/deriving/should_fail/all.T2
5 files changed, 5 insertions, 5 deletions
diff --git a/testsuite/tests/deriving/should_compile/T1830.hs b/testsuite/tests/deriving/should_compile/T1830_2.hs
index edaff7b546..5720aa7f64 100644
--- a/testsuite/tests/deriving/should_compile/T1830.hs
+++ b/testsuite/tests/deriving/should_compile/T1830_2.hs
@@ -1,5 +1,5 @@
{-# LANGUAGE DeriveLift #-}
-module T1830 where
+module T1830_2 where
import Language.Haskell.TH.Syntax (Lift)
diff --git a/testsuite/tests/deriving/should_compile/all.T b/testsuite/tests/deriving/should_compile/all.T
index ec81cc3c05..b1cf3bc475 100644
--- a/testsuite/tests/deriving/should_compile/all.T
+++ b/testsuite/tests/deriving/should_compile/all.T
@@ -16,7 +16,7 @@ test('drv015', normal, compile, [''])
test('drv020', normal, compile, [''])
test('drv022', normal, compile, [''])
test('deriving-1935', normal, compile, [''])
-test('T1830', normal, compile, [''])
+test('T1830_2', normal, compile, [''])
test('T2378', normal, compile, [''])
test('T2856', normal, compile, [''])
test('T3057', extra_clean(['T3057A.o', 'T3057A.hi']), multimod_compile, ['T3057', '-v0'])
diff --git a/testsuite/tests/deriving/should_fail/T1830.hs b/testsuite/tests/deriving/should_fail/T1830_1.hs
index 8108d7342a..e3c2889c1c 100644
--- a/testsuite/tests/deriving/should_fail/T1830.hs
+++ b/testsuite/tests/deriving/should_fail/T1830_1.hs
@@ -1,4 +1,4 @@
-module T1830 where
+module T1830_1 where
import Language.Haskell.TH.Syntax (Lift)
diff --git a/testsuite/tests/deriving/should_fail/T1830.stderr b/testsuite/tests/deriving/should_fail/T1830_1.stderr
index 9c4209161f..c869b0cd16 100644
--- a/testsuite/tests/deriving/should_fail/T1830.stderr
+++ b/testsuite/tests/deriving/should_fail/T1830_1.stderr
@@ -1,5 +1,5 @@
-T1830.hs:5:29: error:
+T1830_1.hs:5:29: error:
Can't make a derived instance of ‘Lift (Foo a)’:
You need DeriveLift to derive an instance for this class
In the data declaration for ‘Foo’
diff --git a/testsuite/tests/deriving/should_fail/all.T b/testsuite/tests/deriving/should_fail/all.T
index d65961268f..28ede8b7c6 100644
--- a/testsuite/tests/deriving/should_fail/all.T
+++ b/testsuite/tests/deriving/should_fail/all.T
@@ -16,7 +16,7 @@ test('drvfail016',
extra_clean(['drvfail016.hi-boot', 'drvfail016.o-boot']),
run_command,
['$MAKE --no-print-directory -s drvfail016'])
-test('T1830', normal, compile_fail, [''])
+test('T1830_1', normal, compile_fail, [''])
test('T2394', normal, compile_fail, [''])
# T2604 was removed as it was out of date re: fixing #9858
test('T2701', normal, compile_fail, [''])