Revert "Batch merge"

This reverts commit 76c8fd674435a652c75a96c85abbf26f1f221876.

3 files changed, 14 insertions, 11 deletions

diff --git a/testsuite/tests/rename/prog006/all.T b/testsuite/tests/rename/prog006/all.T
index 3a956d702a..e119232e0b 100644
--- a/testsuite/tests/rename/prog006/all.T
+++ b/testsuite/tests/rename/prog006/all.T
@@ -1 +1,2 @@
-test('rn.prog006', [extra_files(['A.hs', 'B/', 'Main.hs', 'pwd.hs'])], makefile_test, [])
+test('rn.prog006', [extra_files(['A.hs', 'B/', 'Main.hs', 'pwd.hs'])], run_command,
+     ['$MAKE -s --no-print-directory rn.prog006'])
diff --git a/testsuite/tests/rename/should_compile/all.T b/testsuite/tests/rename/should_compile/all.T
index 0c60360e17..a7c8da4671 100644
--- a/testsuite/tests/rename/should_compile/all.T
+++ b/testsuite/tests/rename/should_compile/all.T
@@ -99,16 +99,17 @@ test('timing001', normal, compile, [''])
 test('timing002', normal, compile, [''])
 test('timing003', normal, compile, [''])
 
-test('T1792_imports', [], makefile_test, ['T1792_imports'])
+test('T1792_imports', [], run_command,
+     ['$MAKE -s --no-print-directory T1792_imports'])
 
-test('T3823', [], makefile_test, ['T3823'])
+test('T3823', [], run_command, ['$MAKE -s --no-print-directory T3823'])
 
-test('T4003', [], makefile_test, ['T4003'])
+test('T4003', [], run_command, ['$MAKE -s --no-print-directory T4003'])
 test('T1789', normal, compile, [''])
 test('T1789_2', normal, compile, [''])
-test('T3449', [], makefile_test, ['T3449'])
-test('T4239', [], makefile_test, ['T4239'])
-test('T4240', [], makefile_test, ['T4240'])
+test('T3449', [], run_command, ['$MAKE -s --no-print-directory T3449'])
+test('T4239', [], run_command, ['$MAKE -s --no-print-directory T4239'])
+test('T4240', [], run_command, ['$MAKE -s --no-print-directory T4240'])
 
 test('T4489', normal, compile, [''])
 test('T4478', normal, compile, [''])
@@ -137,8 +138,8 @@ test('T7336', expect_broken(7336), compile, ['-Wall'])
 
 test('T2435', normal, multimod_compile, ['T2435','-v0'])
 test('T7672', normal, multimod_compile, ['T7672','-v0'])
-test('T7963', [], makefile_test, ['T7963'])
-test('T7969', [], makefile_test, ['T7969'])
+test('T7963', [], run_command, ['$MAKE -s --no-print-directory T7963'])
+test('T7969', [], run_command, ['$MAKE -s --no-print-directory T7969'])
 test('T9127', normal, compile, [''])
 test('T4426', normal, compile_fail, [''])
 test('T9778', normal, compile, ['-fwarn-unticked-promoted-constructors'])
@@ -161,7 +162,7 @@ test('T14487', [], multimod_compile, ['T14487', '-v0'])
 test('T14747', [], multimod_compile, ['T14747', '-v0'])
 test('T15149', [], multimod_compile, ['T15149', '-v0'])
 test('T13064', normal, compile, [''])
-test('T15994', [], makefile_test, ['T15994'])
+test('T15994', [], run_command, ['$MAKE -s --no-print-directory T15994'])
 test('T15798a', normal, compile, [''])
 test('T15798b', normal, compile, [''])
 test('T15798c', normal, compile, [''])
diff --git a/testsuite/tests/rename/should_fail/all.T b/testsuite/tests/rename/should_fail/all.T
index ce8c5c9a13..03ee63b449 100644
--- a/testsuite/tests/rename/should_fail/all.T
+++ b/testsuite/tests/rename/should_fail/all.T
@@ -110,7 +110,8 @@ test('T9815', normal, compile_fail, [''])
 
 test('T9032',
      normal,
-     makefile_test, [])
+     run_command,
+     ['$MAKE -s --no-print-directory T9032'])
 test('T10618', normal, compile_fail, [''])
 test('T10668', normal, compile_fail, [''])
 test('T5001b', normal, compile_fail, [''])