From 172a59335fa6c76b17fb6795e87fbc7fcfd198e6 Mon Sep 17 00:00:00 2001
From: Ben Gamari <ben@smart-cactus.org>
Date: Wed, 30 Jan 2019 10:05:19 -0500
Subject: Revert "Batch merge"

This reverts commit 76c8fd674435a652c75a96c85abbf26f1f221876.
---
 testsuite/tests/driver/dynamicToo/all.T                | 4 ++--
 testsuite/tests/driver/dynamicToo/dynamicToo001/test.T | 2 +-
 testsuite/tests/driver/dynamicToo/dynamicToo002/test.T | 4 ++--
 testsuite/tests/driver/dynamicToo/dynamicToo004/test.T | 3 ++-
 testsuite/tests/driver/dynamicToo/dynamicToo005/test.T | 4 ++--
 5 files changed, 9 insertions(+), 8 deletions(-)

(limited to 'testsuite/tests/driver/dynamicToo')

diff --git a/testsuite/tests/driver/dynamicToo/all.T b/testsuite/tests/driver/dynamicToo/all.T
index 0c890efd70..c190c6bcfc 100644
--- a/testsuite/tests/driver/dynamicToo/all.T
+++ b/testsuite/tests/driver/dynamicToo/all.T
@@ -1,5 +1,5 @@
 
 test('dynamicToo003',
      [extra_files(['A003.hs']),
-      unless(have_vanilla(), skip), unless(have_dynamic(), skip)],
-     makefile_test, [])
+      unless(have_vanilla(), skip), unless(have_dynamic(), skip)], run_command,
+     ['$MAKE -s --no-print-directory dynamicToo003'])
diff --git a/testsuite/tests/driver/dynamicToo/dynamicToo001/test.T b/testsuite/tests/driver/dynamicToo/dynamicToo001/test.T
index 67b1566b54..0d3f81e2e9 100644
--- a/testsuite/tests/driver/dynamicToo/dynamicToo001/test.T
+++ b/testsuite/tests/driver/dynamicToo/dynamicToo001/test.T
@@ -3,4 +3,4 @@ test('dynamicToo001',
      [extra_files(['A.hs', 'B.hs', 'B1.hs', 'B2.hs', 'C.hs']),
       when(opsys('mingw32'), expect_broken(7665)), unless(have_vanilla(), skip),
       unless(have_dynamic(), skip)],
-     makefile_test, [])
+     run_command, ['$MAKE -s --no-print-directory dynamicToo001'])
diff --git a/testsuite/tests/driver/dynamicToo/dynamicToo002/test.T b/testsuite/tests/driver/dynamicToo/dynamicToo002/test.T
index 64e7817d6f..fe94f3758f 100644
--- a/testsuite/tests/driver/dynamicToo/dynamicToo002/test.T
+++ b/testsuite/tests/driver/dynamicToo/dynamicToo002/test.T
@@ -1,5 +1,5 @@
 
 test('dynamicToo002',
      [extra_files(['A.hs', 'B.hs', 'C.hs']),
-      unless(have_vanilla(), skip), unless(have_dynamic(), skip)],
-     makefile_test, [])
+      unless(have_vanilla(), skip), unless(have_dynamic(), skip)], run_command,
+     ['$MAKE -s --no-print-directory dynamicToo002'])
diff --git a/testsuite/tests/driver/dynamicToo/dynamicToo004/test.T b/testsuite/tests/driver/dynamicToo/dynamicToo004/test.T
index e551c952df..72810baa8c 100644
--- a/testsuite/tests/driver/dynamicToo/dynamicToo004/test.T
+++ b/testsuite/tests/driver/dynamicToo/dynamicToo004/test.T
@@ -4,5 +4,6 @@ test('dynamicToo004',
       expect_broken(7665),
       unless(have_vanilla(), skip),
       unless(have_dynamic(), skip)],
-     makefile_test, [])
+     run_command,
+     ['$MAKE -s --no-print-directory dynamicToo004'])
 
diff --git a/testsuite/tests/driver/dynamicToo/dynamicToo005/test.T b/testsuite/tests/driver/dynamicToo/dynamicToo005/test.T
index 58eb6f77ac..f062a21485 100644
--- a/testsuite/tests/driver/dynamicToo/dynamicToo005/test.T
+++ b/testsuite/tests/driver/dynamicToo/dynamicToo005/test.T
@@ -1,5 +1,5 @@
 
 test('dynamicToo005',
      [extra_files(['dynamicToo005.bkp']),
-      unless(have_vanilla(), skip), unless(have_dynamic(), skip)],
-     makefile_test, [])
+      unless(have_vanilla(), skip), unless(have_dynamic(), skip)], run_command,
+     ['$MAKE -s --no-print-directory dynamicToo005'])
-- 
cgit v1.2.1