summaryrefslogtreecommitdiff
path: root/testsuite/tests/determinism
diff options
context:
space:
mode:
authorBen Gamari <ben@smart-cactus.org>2019-01-30 10:05:19 -0500
committerBen Gamari <ben@smart-cactus.org>2019-01-30 10:05:19 -0500
commit172a59335fa6c76b17fb6795e87fbc7fcfd198e6 (patch)
tree6e5e940cb2c6ae9110807fa0d637a280c63b4220 /testsuite/tests/determinism
parent76c8fd674435a652c75a96c85abbf26f1f221876 (diff)
downloadhaskell-172a59335fa6c76b17fb6795e87fbc7fcfd198e6.tar.gz
Revert "Batch merge"
This reverts commit 76c8fd674435a652c75a96c85abbf26f1f221876.
Diffstat (limited to 'testsuite/tests/determinism')
-rw-r--r--testsuite/tests/determinism/T13807/all.T2
-rw-r--r--testsuite/tests/determinism/determ002/all.T2
-rw-r--r--testsuite/tests/determinism/determ003/all.T2
-rw-r--r--testsuite/tests/determinism/determ005/all.T2
-rw-r--r--testsuite/tests/determinism/determ006/all.T2
-rw-r--r--testsuite/tests/determinism/determ007/all.T2
-rw-r--r--testsuite/tests/determinism/determ008/all.T2
-rw-r--r--testsuite/tests/determinism/determ009/all.T2
-rw-r--r--testsuite/tests/determinism/determ010/all.T2
-rw-r--r--testsuite/tests/determinism/determ011/all.T2
-rw-r--r--testsuite/tests/determinism/determ012/all.T2
-rw-r--r--testsuite/tests/determinism/determ013/all.T2
-rw-r--r--testsuite/tests/determinism/determ014/all.T2
-rw-r--r--testsuite/tests/determinism/determ015/all.T2
-rw-r--r--testsuite/tests/determinism/determ016/all.T2
-rw-r--r--testsuite/tests/determinism/determ017/all.T2
-rw-r--r--testsuite/tests/determinism/determ018/all.T2
-rw-r--r--testsuite/tests/determinism/determ019/all.T2
-rw-r--r--testsuite/tests/determinism/determ021/all.T3
-rw-r--r--testsuite/tests/determinism/determ022/all.T2
20 files changed, 21 insertions, 20 deletions
diff --git a/testsuite/tests/determinism/T13807/all.T b/testsuite/tests/determinism/T13807/all.T
index 415917ca48..465d57c239 100644
--- a/testsuite/tests/determinism/T13807/all.T
+++ b/testsuite/tests/determinism/T13807/all.T
@@ -1 +1 @@
-test('T13807', [extra_files(['A.hs'])], makefile_test, ['T13807'])
+test('T13807', [extra_files(['A.hs'])], run_command, ['$MAKE -s --no-print-directory T13807'])
diff --git a/testsuite/tests/determinism/determ002/all.T b/testsuite/tests/determinism/determ002/all.T
index 02870df068..1642c2f8c6 100644
--- a/testsuite/tests/determinism/determ002/all.T
+++ b/testsuite/tests/determinism/determ002/all.T
@@ -1 +1 @@
-test('determ002', [extra_files(['A.hs'])], makefile_test, ['determ002'])
+test('determ002', [extra_files(['A.hs'])], run_command, ['$MAKE -s --no-print-directory determ002'])
diff --git a/testsuite/tests/determinism/determ003/all.T b/testsuite/tests/determinism/determ003/all.T
index 07e6964994..b4bc18c1a2 100644
--- a/testsuite/tests/determinism/determ003/all.T
+++ b/testsuite/tests/determinism/determ003/all.T
@@ -1 +1 @@
-test('determ003', [extra_files(['A.hs'])], makefile_test, ['determ003'])
+test('determ003', [extra_files(['A.hs'])], run_command, ['$MAKE -s --no-print-directory determ003'])
diff --git a/testsuite/tests/determinism/determ005/all.T b/testsuite/tests/determinism/determ005/all.T
index 2a5e189e1a..c39aa8b203 100644
--- a/testsuite/tests/determinism/determ005/all.T
+++ b/testsuite/tests/determinism/determ005/all.T
@@ -1 +1 @@
-test('determ005', [extra_files(['A.hs'])], makefile_test, ['determ005'])
+test('determ005', [extra_files(['A.hs'])], run_command, ['$MAKE -s --no-print-directory determ005'])
diff --git a/testsuite/tests/determinism/determ006/all.T b/testsuite/tests/determinism/determ006/all.T
index 71c7bbb04e..a0e547beea 100644
--- a/testsuite/tests/determinism/determ006/all.T
+++ b/testsuite/tests/determinism/determ006/all.T
@@ -1 +1 @@
-test('determ006', [extra_files(['spec-inline-determ.hs'])], makefile_test, ['determ006'])
+test('determ006', [extra_files(['spec-inline-determ.hs'])], run_command, ['$MAKE -s --no-print-directory determ006'])
diff --git a/testsuite/tests/determinism/determ007/all.T b/testsuite/tests/determinism/determ007/all.T
index 0330980ebe..d9f1f5bfa7 100644
--- a/testsuite/tests/determinism/determ007/all.T
+++ b/testsuite/tests/determinism/determ007/all.T
@@ -1 +1 @@
-test('determ007', [extra_files(['A.hs'])], makefile_test, ['determ007'])
+test('determ007', [extra_files(['A.hs'])], run_command, ['$MAKE -s --no-print-directory determ007'])
diff --git a/testsuite/tests/determinism/determ008/all.T b/testsuite/tests/determinism/determ008/all.T
index 8fb078d818..da539a055b 100644
--- a/testsuite/tests/determinism/determ008/all.T
+++ b/testsuite/tests/determinism/determ008/all.T
@@ -1 +1 @@
-test('determ008', [extra_files(['A.hs'])], makefile_test, ['determ008'])
+test('determ008', [extra_files(['A.hs'])], run_command, ['$MAKE -s --no-print-directory determ008'])
diff --git a/testsuite/tests/determinism/determ009/all.T b/testsuite/tests/determinism/determ009/all.T
index c239ddb647..7b2e4cc6fd 100644
--- a/testsuite/tests/determinism/determ009/all.T
+++ b/testsuite/tests/determinism/determ009/all.T
@@ -1 +1 @@
-test('determ009', [extra_files(['A.hs'])], makefile_test, ['determ009'])
+test('determ009', [extra_files(['A.hs'])], run_command, ['$MAKE -s --no-print-directory determ009'])
diff --git a/testsuite/tests/determinism/determ010/all.T b/testsuite/tests/determinism/determ010/all.T
index 3585ad15f3..10c89af351 100644
--- a/testsuite/tests/determinism/determ010/all.T
+++ b/testsuite/tests/determinism/determ010/all.T
@@ -1 +1 @@
-test('determ010', [extra_files(['A.hs'])], makefile_test, ['determ010'])
+test('determ010', [extra_files(['A.hs'])], run_command, ['$MAKE -s --no-print-directory determ010'])
diff --git a/testsuite/tests/determinism/determ011/all.T b/testsuite/tests/determinism/determ011/all.T
index d608caf340..fedb3a0211 100644
--- a/testsuite/tests/determinism/determ011/all.T
+++ b/testsuite/tests/determinism/determ011/all.T
@@ -1 +1 @@
-test('determ011', [extra_files(['A.hs'])], makefile_test, ['determ011'])
+test('determ011', [extra_files(['A.hs'])], run_command, ['$MAKE -s --no-print-directory determ011'])
diff --git a/testsuite/tests/determinism/determ012/all.T b/testsuite/tests/determinism/determ012/all.T
index 9d806e1399..17f557cbf0 100644
--- a/testsuite/tests/determinism/determ012/all.T
+++ b/testsuite/tests/determinism/determ012/all.T
@@ -1 +1 @@
-test('determ012', [extra_files(['A.hs'])], makefile_test, ['determ012'])
+test('determ012', [extra_files(['A.hs'])], run_command, ['$MAKE -s --no-print-directory determ012'])
diff --git a/testsuite/tests/determinism/determ013/all.T b/testsuite/tests/determinism/determ013/all.T
index 149362d943..21ea1f4344 100644
--- a/testsuite/tests/determinism/determ013/all.T
+++ b/testsuite/tests/determinism/determ013/all.T
@@ -1 +1 @@
-test('determ013', [extra_files(['A.hs'])], makefile_test, ['determ013'])
+test('determ013', [extra_files(['A.hs'])], run_command, ['$MAKE -s --no-print-directory determ013'])
diff --git a/testsuite/tests/determinism/determ014/all.T b/testsuite/tests/determinism/determ014/all.T
index 50359fd48b..4e27332bb5 100644
--- a/testsuite/tests/determinism/determ014/all.T
+++ b/testsuite/tests/determinism/determ014/all.T
@@ -1 +1 @@
-test('determ014', [extra_files(['A.hs'])], makefile_test, ['determ014'])
+test('determ014', [extra_files(['A.hs'])], run_command, ['$MAKE -s --no-print-directory determ014'])
diff --git a/testsuite/tests/determinism/determ015/all.T b/testsuite/tests/determinism/determ015/all.T
index 1a2a9b990a..2b8ec7c883 100644
--- a/testsuite/tests/determinism/determ015/all.T
+++ b/testsuite/tests/determinism/determ015/all.T
@@ -1 +1 @@
-test('determ015', [extra_files(['A.hs'])], makefile_test, ['determ015'])
+test('determ015', [extra_files(['A.hs'])], run_command, ['$MAKE -s --no-print-directory determ015'])
diff --git a/testsuite/tests/determinism/determ016/all.T b/testsuite/tests/determinism/determ016/all.T
index 6d4da6774e..bb3a2cfa88 100644
--- a/testsuite/tests/determinism/determ016/all.T
+++ b/testsuite/tests/determinism/determ016/all.T
@@ -1 +1 @@
-test('determ016', [extra_files(['A.hs'])], makefile_test, ['determ016'])
+test('determ016', [extra_files(['A.hs'])], run_command, ['$MAKE -s --no-print-directory determ016'])
diff --git a/testsuite/tests/determinism/determ017/all.T b/testsuite/tests/determinism/determ017/all.T
index 75f5470726..a81692d639 100644
--- a/testsuite/tests/determinism/determ017/all.T
+++ b/testsuite/tests/determinism/determ017/all.T
@@ -1 +1 @@
-test('determ017', [extra_files(['A.hs'])], makefile_test, ['determ017'])
+test('determ017', [extra_files(['A.hs'])], run_command, ['$MAKE -s --no-print-directory determ017'])
diff --git a/testsuite/tests/determinism/determ018/all.T b/testsuite/tests/determinism/determ018/all.T
index f75dcd67fb..9d672264c2 100644
--- a/testsuite/tests/determinism/determ018/all.T
+++ b/testsuite/tests/determinism/determ018/all.T
@@ -1 +1 @@
-test('determ018', [extra_files(['A.hs'])], makefile_test, ['determ018'])
+test('determ018', [extra_files(['A.hs'])], run_command, ['$MAKE -s --no-print-directory determ018'])
diff --git a/testsuite/tests/determinism/determ019/all.T b/testsuite/tests/determinism/determ019/all.T
index ae07e7bea0..fc44db070a 100644
--- a/testsuite/tests/determinism/determ019/all.T
+++ b/testsuite/tests/determinism/determ019/all.T
@@ -1 +1 @@
-test('determ019', [extra_files(['A.hs'])], makefile_test, ['determ019'])
+test('determ019', [extra_files(['A.hs'])], run_command, ['$MAKE -s --no-print-directory determ019'])
diff --git a/testsuite/tests/determinism/determ021/all.T b/testsuite/tests/determinism/determ021/all.T
index afad3581f5..331d1f1a21 100644
--- a/testsuite/tests/determinism/determ021/all.T
+++ b/testsuite/tests/determinism/determ021/all.T
@@ -1,3 +1,4 @@
test('determ021',
[normalise_fun(normalise_errmsg), extra_files(['A.hs'])],
- makefile_test, ['determ021'])
+ run_command,
+ ['$MAKE -s --no-print-directory determ021'])
diff --git a/testsuite/tests/determinism/determ022/all.T b/testsuite/tests/determinism/determ022/all.T
index 868649e66c..3ecdf3ca1c 100644
--- a/testsuite/tests/determinism/determ022/all.T
+++ b/testsuite/tests/determinism/determ022/all.T
@@ -1 +1 @@
-test('determ022', [extra_files(['A.hs'])], makefile_test, ['determ022'])
+test('determ022', [extra_files(['A.hs'])], run_command, ['$MAKE -s --no-print-directory determ022'])