Rename bundled pattern synonym tests to reflect new terminology

This also fixes a bug which causes intermittent test failures due to
interdependent tests.

7 files changed, 15 insertions, 15 deletions

diff --git a/testsuite/tests/patsyn/should_compile/Associated.hs b/testsuite/tests/patsyn/should_compile/Associated.hs
deleted file mode 100644
index b4ea94922d..0000000000
--- a/testsuite/tests/patsyn/should_compile/Associated.hs
+++ /dev/null
@@ -1,9 +0,0 @@
-module Associated(A(..)) where
-
-import AssociatedInternal (A(..))
-
-foo = MkA 5
-baz = NoA
-
-qux (MkA x) = x
-qux NoA = 0
diff --git a/testsuite/tests/patsyn/should_compile/Bundle.hs b/testsuite/tests/patsyn/should_compile/Bundle.hs
new file mode 100644
index 0000000000..1a304106fc
--- /dev/null
+++ b/testsuite/tests/patsyn/should_compile/Bundle.hs
@@ -0,0 +1,9 @@
+module Bundle(A(..)) where
+
+import BundleInternal (A(..))
+
+foo = MkA 5
+baz = NoA
+
+qux (MkA x) = x
+qux NoA = 0
diff --git a/testsuite/tests/patsyn/should_compile/Associated1.hs b/testsuite/tests/patsyn/should_compile/Bundle1.hs
index fce00b3850..256f2fa36d 100644
--- a/testsuite/tests/patsyn/should_compile/Associated1.hs
+++ b/testsuite/tests/patsyn/should_compile/Bundle1.hs
@@ -1,6 +1,6 @@
 module Associated1(A(..)) where
 
-import AssociatedInternal1 (A(..))
+import BundleInternal1 (A(..))
 
 foo = MkA 5
 baz = NoA
diff --git a/testsuite/tests/patsyn/should_compile/AssociatedInternal.hs b/testsuite/tests/patsyn/should_compile/BundleInternal.hs
index b3e6506651..6a79811e55 100644
--- a/testsuite/tests/patsyn/should_compile/AssociatedInternal.hs
+++ b/testsuite/tests/patsyn/should_compile/BundleInternal.hs
@@ -1,5 +1,5 @@
 {-# LANGUAGE PatternSynonyms #-}
-module AssociatedInternal (A(NewA,MkA, NoA)) where
+module BundleInternal (A(NewA,MkA, NoA)) where
 
 newtype A = NewA (Maybe Int)
 
diff --git a/testsuite/tests/patsyn/should_compile/AssociatedInternal1.hs b/testsuite/tests/patsyn/should_compile/BundleInternal1.hs
index 7997d1db21..9eee273172 100644
--- a/testsuite/tests/patsyn/should_compile/AssociatedInternal1.hs
+++ b/testsuite/tests/patsyn/should_compile/BundleInternal1.hs
@@ -1,5 +1,5 @@
 {-# LANGUAGE PatternSynonyms #-}
-module AssociatedInternal1 (A(NewA,MkA, NoA)) where
+module BundleInternal1 (A(NewA,MkA, NoA)) where
 
 newtype A = NewA (Maybe Int)
 
diff --git a/testsuite/tests/patsyn/should_compile/TransAssociated.hs b/testsuite/tests/patsyn/should_compile/TransBundle.hs
index a5fbe0c0bb..9aceb79e91 100644
--- a/testsuite/tests/patsyn/should_compile/TransAssociated.hs
+++ b/testsuite/tests/patsyn/should_compile/TransBundle.hs
@@ -1,6 +1,6 @@
 module TransAssociated(A(..)) where
 
-import Associated (A(..))
+import Bundle (A(..))
 
 foo = MkA 5
 baz = NoA
diff --git a/testsuite/tests/patsyn/should_compile/all.T b/testsuite/tests/patsyn/should_compile/all.T
index 7160a8128d..8000d2379a 100644
--- a/testsuite/tests/patsyn/should_compile/all.T
+++ b/testsuite/tests/patsyn/should_compile/all.T
@@ -33,8 +33,8 @@ test('records-poly', normal, compile, [''])
 test('records-req', normal, compile, [''])
 test('records-prov-req', normal, compile, [''])
 test('records-req-only', normal, compile, [''])
-test('Associated', [extra_clean(['AssociatedInternal1.hi', 'AssociatedInternal1.o'])], multimod_compile, ['Associated1', '-v0'])
-test('TransAssociated', [extra_clean(['Associated.hi', 'Associated.o', 'AssociatedInternal.hi', 'AssociatedInternal.o'])], multimod_compile, ['TransAssociated', '-v0'])
+test('pat-syn-bundle', [extra_clean(['BundleInternal1.hi', 'BundleInternal1.o'])], multimod_compile, ['Bundle1', '-v0'])
+test('pat-syn-trans-bundle', [extra_clean(['Bundle.hi', 'Bundle.o', 'BundleInternal.hi', 'BundleInternal.o'])], multimod_compile, ['TransBundle', '-v0'])
 test('ExportSyntax', normal, compile, [''])
 test('ExportSyntaxImport', [extra_clean(['ExportSyntax.hi', 'ExportSyntax.o'])], multimod_compile, ['ExportSyntaxImport', '-v0'])
 test('poly-export', normal, compile, [''])