Revert "Batch merge"

This reverts commit 76c8fd674435a652c75a96c85abbf26f1f221876.

1 files changed, 33 insertions, 32 deletions

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'])