Revert "Batch merge"

This reverts commit 76c8fd674435a652c75a96c85abbf26f1f221876.

4 files changed, 48 insertions, 65 deletions

diff --git a/testsuite/tests/ghc-api/annotations/T11018.stdout b/testsuite/tests/ghc-api/annotations/T11018.stdout
index 4640e33690..b4150305ab 100644
--- a/testsuite/tests/ghc-api/annotations/T11018.stdout
+++ b/testsuite/tests/ghc-api/annotations/T11018.stdout
@@ -2,7 +2,8 @@
 []
 ---Ann before enclosing span problem (should be empty list)---
 [
-
+((Test11018.hs:12:22-31,AnnOpenP), [Test11018.hs:12:21]),
+((Test11018.hs:37:23-31,AnnOpenP), [Test11018.hs:37:22])
 ]
 
 ---Annotations-----------------------
@@ -23,14 +24,14 @@
 ((Test11018.hs:(7,16)-(9,10),AnnDo), [Test11018.hs:7:16-17]),
 ((Test11018.hs:8:3-15,AnnLarrow), [Test11018.hs:8:5-6]),
 ((Test11018.hs:8:3-15,AnnSemi), [Test11018.hs:9:3]),
-((Test11018.hs:(12,1)-(15,7),AnnCloseP), [Test11018.hs:12:32]),
 ((Test11018.hs:(12,1)-(15,7),AnnData), [Test11018.hs:12:1-4]),
 ((Test11018.hs:(12,1)-(15,7),AnnEqual), [Test11018.hs:13:5]),
-((Test11018.hs:(12,1)-(15,7),AnnOpenP), [Test11018.hs:12:21]),
 ((Test11018.hs:(12,1)-(15,7),AnnSemi), [Test11018.hs:17:1]),
 ((Test11018.hs:12:21-32,AnnCloseP), [Test11018.hs:12:32]),
 ((Test11018.hs:12:21-32,AnnOpenP), [Test11018.hs:12:21]),
+((Test11018.hs:12:22-31,AnnCloseP), [Test11018.hs:12:32]),
 ((Test11018.hs:12:22-31,AnnDcolonU), [Test11018.hs:12:24]),
+((Test11018.hs:12:22-31,AnnOpenP), [Test11018.hs:12:21]),
 ((Test11018.hs:12:26,AnnRarrow), [Test11018.hs:12:28-29]),
 ((Test11018.hs:12:26-31,AnnRarrow), [Test11018.hs:12:28-29]),
 ((Test11018.hs:(13,16)-(15,7),AnnCloseC), [Test11018.hs:15:7]),
@@ -123,14 +124,14 @@
 ((Test11018.hs:(32,13)-(34,10),AnnDo), [Test11018.hs:32:13-14]),
 ((Test11018.hs:33:3-14,AnnLarrowU), [Test11018.hs:33:5]),
 ((Test11018.hs:33:3-14,AnnSemi), [Test11018.hs:34:3]),
-((Test11018.hs:(37,1)-(40,7),AnnCloseP), [Test11018.hs:37:32]),
 ((Test11018.hs:(37,1)-(40,7),AnnData), [Test11018.hs:37:1-4]),
 ((Test11018.hs:(37,1)-(40,7),AnnEqual), [Test11018.hs:38:5]),
-((Test11018.hs:(37,1)-(40,7),AnnOpenP), [Test11018.hs:37:22]),
 ((Test11018.hs:(37,1)-(40,7),AnnSemi), [Test11018.hs:42:1]),
 ((Test11018.hs:37:22-32,AnnCloseP), [Test11018.hs:37:32]),
 ((Test11018.hs:37:22-32,AnnOpenP), [Test11018.hs:37:22]),
+((Test11018.hs:37:23-31,AnnCloseP), [Test11018.hs:37:32]),
 ((Test11018.hs:37:23-31,AnnDcolonU), [Test11018.hs:37:25]),
+((Test11018.hs:37:23-31,AnnOpenP), [Test11018.hs:37:22]),
 ((Test11018.hs:37:27,AnnRarrowU), [Test11018.hs:37:29]),
 ((Test11018.hs:37:27-31,AnnRarrowU), [Test11018.hs:37:29]),
 ((Test11018.hs:(38,17)-(40,7),AnnCloseC), [Test11018.hs:40:7]),
diff --git a/testsuite/tests/ghc-api/annotations/T16212.stdout b/testsuite/tests/ghc-api/annotations/T16212.stdout
index d4f0f08d89..5b91c36253 100644
--- a/testsuite/tests/ghc-api/annotations/T16212.stdout
+++ b/testsuite/tests/ghc-api/annotations/T16212.stdout
@@ -1,10 +1,5 @@
----Unattached Annotation Problems (should be empty list)---
+---Problems (should be empty list)---
 []
----Ann before enclosing span problem (should be empty list)---
-[
-
-]
-
 ---Annotations-----------------------
 -- SrcSpan the annotation is attached to, AnnKeywordId,
 --    list of locations the keyword item appears in
@@ -12,37 +7,37 @@
 ((Test16212.hs:1:1,AnnModule), [Test16212.hs:1:1-6]),
 ((Test16212.hs:1:1,AnnWhere), [Test16212.hs:1:18-22]),
 ((Test16212.hs:(3,1)-(4,37),AnnClass), [Test16212.hs:3:1-5]),
-((Test16212.hs:(3,1)-(4,37),AnnCloseP), [Test16212.hs:3:37]),
-((Test16212.hs:(3,1)-(4,37),AnnOpenP), [Test16212.hs:3:21]),
 ((Test16212.hs:(3,1)-(4,37),AnnSemi), [Test16212.hs:6:1]),
 ((Test16212.hs:(3,1)-(4,37),AnnWhere), [Test16212.hs:3:39-43]),
 ((Test16212.hs:3:21-37,AnnCloseP), [Test16212.hs:3:37]),
 ((Test16212.hs:3:21-37,AnnOpenP), [Test16212.hs:3:21]),
+((Test16212.hs:3:22-36,AnnCloseP), [Test16212.hs:3:37]),
 ((Test16212.hs:3:22-36,AnnDcolon), [Test16212.hs:3:28-29]),
+((Test16212.hs:3:22-36,AnnOpenP), [Test16212.hs:3:21]),
 ((Test16212.hs:4:3-37,AnnDcolon), [Test16212.hs:4:9-10]),
 ((Test16212.hs:4:29-37,AnnCloseP), [Test16212.hs:4:37]),
 ((Test16212.hs:4:29-37,AnnOpenP), [Test16212.hs:4:29]),
 ((Test16212.hs:(6,1)-(7,37),AnnClass), [Test16212.hs:6:1-5]),
-((Test16212.hs:(6,1)-(7,37),AnnCloseP), [Test16212.hs:6:40, Test16212.hs:6:39]),
-((Test16212.hs:(6,1)-(7,37),AnnOpenP), [Test16212.hs:6:22, Test16212.hs:6:23]),
 ((Test16212.hs:(6,1)-(7,37),AnnSemi), [Test16212.hs:9:1]),
 ((Test16212.hs:(6,1)-(7,37),AnnWhere), [Test16212.hs:6:42-46]),
 ((Test16212.hs:6:22-40,AnnCloseP), [Test16212.hs:6:40]),
 ((Test16212.hs:6:22-40,AnnOpenP), [Test16212.hs:6:22]),
 ((Test16212.hs:6:23-39,AnnCloseP), [Test16212.hs:6:39]),
 ((Test16212.hs:6:23-39,AnnOpenP), [Test16212.hs:6:23]),
+((Test16212.hs:6:24-38,AnnCloseP), [Test16212.hs:6:40, Test16212.hs:6:39]),
 ((Test16212.hs:6:24-38,AnnDcolon), [Test16212.hs:6:30-31]),
+((Test16212.hs:6:24-38,AnnOpenP), [Test16212.hs:6:22, Test16212.hs:6:23]),
 ((Test16212.hs:7:3-37,AnnDcolon), [Test16212.hs:7:9-10]),
 ((Test16212.hs:7:29-37,AnnCloseP), [Test16212.hs:7:37]),
 ((Test16212.hs:7:29-37,AnnOpenP), [Test16212.hs:7:29]),
-((Test16212.hs:(9,1)-(11,36),AnnCloseP), [Test16212.hs:9:23]),
 ((Test16212.hs:(9,1)-(11,36),AnnData), [Test16212.hs:9:1-4]),
-((Test16212.hs:(9,1)-(11,36),AnnOpenP), [Test16212.hs:9:10]),
-((Test16212.hs:(9,1)-(11,36),AnnSemi), [Test16212.hs:13:1]),
+((Test16212.hs:(9,1)-(11,36),AnnSemi), [Test16212.hs:12:1]),
 ((Test16212.hs:(9,1)-(11,36),AnnWhere), [Test16212.hs:9:25-29]),
 ((Test16212.hs:9:10-23,AnnCloseP), [Test16212.hs:9:23]),
 ((Test16212.hs:9:10-23,AnnOpenP), [Test16212.hs:9:10]),
+((Test16212.hs:9:11-22,AnnCloseP), [Test16212.hs:9:23]),
 ((Test16212.hs:9:11-22,AnnDcolon), [Test16212.hs:9:13-14]),
+((Test16212.hs:9:11-22,AnnOpenP), [Test16212.hs:9:10]),
 ((Test16212.hs:10:5-23,AnnDcolon), [Test16212.hs:10:13-14]),
 ((Test16212.hs:10:5-23,AnnSemi), [Test16212.hs:11:5]),
 ((Test16212.hs:11:5-36,AnnDcolon), [Test16212.hs:11:13-14]),
@@ -50,17 +45,5 @@
 ((Test16212.hs:11:16-36,AnnRarrow), [Test16212.hs:11:22-23]),
 ((Test16212.hs:11:29-36,AnnCloseP), [Test16212.hs:11:36]),
 ((Test16212.hs:11:29-36,AnnOpenP), [Test16212.hs:11:29]),
-((Test16212.hs:13:1-41,AnnCloseP), [Test16212.hs:13:12]),
-((Test16212.hs:13:1-41,AnnData), [Test16212.hs:13:1-4]),
-((Test16212.hs:13:1-41,AnnEqual), [Test16212.hs:13:16]),
-((Test16212.hs:13:1-41,AnnOpenP), [Test16212.hs:13:10]),
-((Test16212.hs:13:1-41,AnnSemi), [Test16212.hs:14:1]),
-((Test16212.hs:13:10-12,AnnCloseP), [Test16212.hs:13:12]),
-((Test16212.hs:13:10-12,AnnOpenP), [Test16212.hs:13:10]),
-((Test16212.hs:13:22-41,AnnCloseC), [Test16212.hs:13:41]),
-((Test16212.hs:13:22-41,AnnOpenC), [Test16212.hs:13:22]),
-((Test16212.hs:13:24-30,AnnComma), [Test16212.hs:13:31]),
-((Test16212.hs:13:24-30,AnnDcolon), [Test16212.hs:13:27-28]),
-((Test16212.hs:13:33-39,AnnDcolon), [Test16212.hs:13:36-37]),
-((<no location info>,AnnEofPos), [Test16212.hs:14:1])
+((<no location info>,AnnEofPos), [Test16212.hs:12:1])
 ]
diff --git a/testsuite/tests/ghc-api/annotations/Test16212.hs b/testsuite/tests/ghc-api/annotations/Test16212.hs
index da7e322307..6c2baad7e2 100644
--- a/testsuite/tests/ghc-api/annotations/Test16212.hs
+++ b/testsuite/tests/ghc-api/annotations/Test16212.hs
@@ -9,5 +9,3 @@ class LiftingMonad2  ((trans :: MTrans)) where
 data Nat (t :: NatKind) where
     ZeroNat :: Nat Zero
     SuccNat :: Nat t -> Nat (Succ t)
-
-data Foo (a) b = Foo { av :: a, bv :: b }
diff --git a/testsuite/tests/ghc-api/annotations/all.T b/testsuite/tests/ghc-api/annotations/all.T
index 8002630b53..49f0780021 100644
--- a/testsuite/tests/ghc-api/annotations/all.T
+++ b/testsuite/tests/ghc-api/annotations/all.T
@@ -1,64 +1,65 @@
 test('annotations', [extra_files(['AnnotationLet.hs']),
-                     ignore_stderr], makefile_test, ['annotations'])
+                     ignore_stderr], run_command, ['$MAKE -s --no-print-directory annotations'])
 test('parseTree',   [extra_files(['AnnotationTuple.hs']),
-                     ignore_stderr], makefile_test, ['parseTree'])
+                     ignore_stderr], run_command, ['$MAKE -s --no-print-directory parseTree'])
 test('comments',    [extra_files(['CommentsTest.hs']),
-                     ignore_stderr], makefile_test, ['comments'])
+                     ignore_stderr], run_command, ['$MAKE -s --no-print-directory comments'])
 test('exampleTest', [extra_files(['AnnotationTuple.hs']),
-                     ignore_stderr], makefile_test, ['exampleTest'])
+                     ignore_stderr], run_command, ['$MAKE -s --no-print-directory exampleTest'])
 test('listcomps',   [extra_files(['ListComprehensions.hs']),
-                     ignore_stderr], makefile_test, ['listcomps'])
+                     ignore_stderr], run_command, ['$MAKE -s --no-print-directory listcomps'])
 test('T10255',      [extra_files(['Test10255.hs']),
-                     ignore_stderr], makefile_test, ['T10255'])
+                     ignore_stderr], run_command, ['$MAKE -s --no-print-directory T10255'])
 test('T10268',      [extra_files(['Test10268.hs']),
-                     ignore_stderr], makefile_test, ['T10268'])
+                     ignore_stderr], run_command, ['$MAKE -s --no-print-directory T10268'])
 test('T10269',      [extra_files(['Test10269.hs']),
-                     ignore_stderr], makefile_test, ['T10269'])
+                     ignore_stderr], run_command, ['$MAKE -s --no-print-directory T10269'])
 test('T10280',      [extra_files(['Test10280.hs']),
-                     ignore_stderr], makefile_test, ['T10280'])
+                     ignore_stderr], run_command, ['$MAKE -s --no-print-directory T10280'])
 test('T10312',      [extra_files(['Test10312.hs']),
-                     ignore_stderr], makefile_test, ['T10312'])
+                     ignore_stderr], run_command, ['$MAKE -s --no-print-directory T10312'])
 test('T10307',      [extra_files(['Test10307.hs']),
-                     ignore_stderr], makefile_test, ['T10307'])
+                     ignore_stderr], run_command, ['$MAKE -s --no-print-directory T10307'])
 test('T10309',      [extra_files(['Test10309.hs']),
-                     ignore_stderr], makefile_test, ['T10309'])
+                     ignore_stderr], run_command, ['$MAKE -s --no-print-directory T10309'])
 test('boolFormula', [extra_files(['TestBoolFormula.hs']),
-                     ignore_stderr], makefile_test, ['boolFormula'])
+                     ignore_stderr], run_command, ['$MAKE -s --no-print-directory boolFormula'])
 test('T10357',      [extra_files(['Test10357.hs']),
-                     ignore_stderr], makefile_test, ['T10357'])
+                     ignore_stderr], run_command, ['$MAKE -s --no-print-directory T10357'])
 test('T10358',      [extra_files(['Test10358.hs']),
-                     ignore_stderr], makefile_test, ['T10358'])
+                     ignore_stderr], run_command, ['$MAKE -s --no-print-directory T10358'])
 test('T10278',      [extra_files(['Test10278.hs']),
-                     ignore_stderr], makefile_test, ['T10278'])
+                     ignore_stderr], run_command, ['$MAKE -s --no-print-directory T10278'])
 test('T10354',      [extra_files(['Test10354.hs']),
-                     ignore_stderr], makefile_test, ['T10354'])
+                     ignore_stderr], run_command, ['$MAKE -s --no-print-directory T10354'])
 test('T10396',      [extra_files(['Test10396.hs']),
-                     ignore_stderr], makefile_test, ['T10396'])
+                     ignore_stderr], run_command, ['$MAKE -s --no-print-directory T10396'])
 test('T10399',      [extra_files(['Test10399.hs']),
-                     ignore_stderr], makefile_test, ['T10399'])
+                     ignore_stderr], run_command, ['$MAKE -s --no-print-directory T10399'])
 test('T10313',      [extra_files(['Test10313.hs', 'stringSource.hs']),
-                     ignore_stderr], makefile_test, ['T10313'])
-test('T11018',      [extra_files(['Test11018.hs']),
-                     ignore_stderr], makefile_test, ['T11018'])
+                     ignore_stderr], run_command, ['$MAKE -s --no-print-directory T10313'])
+# Stricter tests from trac #16217 now causes this to fail. Will be fixed for trac #16212
+test('T11018',      [expect_broken(11018),extra_files(['Test11018.hs']),
+                     ignore_stderr], run_command, ['$MAKE -s --no-print-directory T11018'])
 test('bundle-export', [extra_files(['BundleExport.hs']),
-                       ignore_stderr], makefile_test, ['bundle-export'])
+                       ignore_stderr], run_command, ['$MAKE -s --no-print-directory bundle-export'])
 test('T10276',      [extra_files(['Test10276.hs']),
-                     ignore_stderr], makefile_test, ['T10276'])
+                     ignore_stderr], run_command, ['$MAKE -s --no-print-directory T10276'])
 test('T10598',      [extra_files(['Test10598.hs']),
-                     ignore_stderr], makefile_test, ['T10598'])
+                     ignore_stderr], run_command, ['$MAKE -s --no-print-directory T10598'])
 test('T11321',      [extra_files(['Test11321.hs']),
-                     ignore_stderr], makefile_test, ['T11321'])
+                     ignore_stderr], run_command, ['$MAKE -s --no-print-directory T11321'])
 test('T11332',      [extra_files(['Test11332.hs']),
-                     ignore_stderr], makefile_test, ['T11332'])
+                     ignore_stderr], run_command, ['$MAKE -s --no-print-directory T11332'])
 test('T11430',      [extra_files(['Test11430.hs', 't11430.hs']),
-                     ignore_stderr], makefile_test, ['T11430'])
-test('load-main',   ignore_stderr, makefile_test, ['load-main'])
+                     ignore_stderr], run_command, ['$MAKE -s --no-print-directory T11430'])
+test('load-main',   ignore_stderr, run_command, ['$MAKE -s --no-print-directory load-main'])
 test('T12417',      [extra_files(['Test12417.hs']),
-                     ignore_stderr], makefile_test, ['T12417'])
+                     ignore_stderr], run_command, ['$MAKE -s --no-print-directory T12417'])
 test('T13163',      [extra_files(['Test13163.hs']),
-                     ignore_stderr], makefile_test, ['T13163'])
+                     ignore_stderr], run_command, ['$MAKE -s --no-print-directory T13163'])
 test('T15303',      [extra_files(['Test15303.hs']),
-                     ignore_stderr], makefile_test, ['T15303'])
+                     ignore_stderr], run_command, ['$MAKE -s --no-print-directory T15303'])
 # Stricter tests from trac #16217 now causes this to fail. Will be fixed for trac #16212
 test('T16212',      [expect_broken(16212),extra_files(['Test16212.hs']),
                      ignore_stderr], run_command, ['$MAKE -s --no-print-directory T16212'])