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>

9 files changed, 10 insertions, 10 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, [''])
diff --git a/testsuite/tests/th/T1830.hs b/testsuite/tests/th/T1830_3.hs
index a119ec515b..3a17548fa8 100644
--- a/testsuite/tests/th/T1830.hs
+++ b/testsuite/tests/th/T1830_3.hs
@@ -2,7 +2,7 @@
 module Main where
 
 import Language.Haskell.TH.Syntax (lift)
-import T1830a
+import T1830_3a
 
 main :: IO ()
 main = do
diff --git a/testsuite/tests/th/T1830.stdout b/testsuite/tests/th/T1830_3.stdout
index 672e08f95c..672e08f95c 100644
--- a/testsuite/tests/th/T1830.stdout
+++ b/testsuite/tests/th/T1830_3.stdout
diff --git a/testsuite/tests/th/T1830a.hs b/testsuite/tests/th/T1830_3a.hs
index 5012acd117..49c059d0cb 100644
--- a/testsuite/tests/th/T1830a.hs
+++ b/testsuite/tests/th/T1830_3a.hs
@@ -2,7 +2,7 @@
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
 {-# LANGUAGE MagicHash #-}
 {-# LANGUAGE TypeFamilies #-}
-module T1830a where
+module T1830_3a where
 
 import GHC.Exts
 import Language.Haskell.TH.Syntax (Lift(..))
diff --git a/testsuite/tests/th/all.T b/testsuite/tests/th/all.T
index 0bb4aa4bb0..f72cc30f81 100644
--- a/testsuite/tests/th/all.T
+++ b/testsuite/tests/th/all.T
@@ -127,10 +127,10 @@ test('TH_ghci1', normal, ghci_script, ['TH_ghci1.script'])
 
 test('TH_linePragma', normal, compile_fail, ['-v0'])
 
-test('T1830',
-     extra_clean(['T1830a.o','T1830a.hi']),
+test('T1830_3',
+     extra_clean(['T1830_3a.o','T1830_3a.hi']),
      multimod_compile_and_run,
-     ['T1830', '-v0'])
+     ['T1830_3', '-v0'])
 test('T2700', normal, compile, ['-v0'])
 test('T2817', normal, compile, ['-v0'])
 test('T2713', normal, compile_fail, ['-v0'])