From 76c8fd674435a652c75a96c85abbf26f1f221876 Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Wed, 30 Jan 2019 01:06:12 -0500 Subject: Batch merge --- .../tests/simplCore/should_compile/T16038/test.T | 3 +- testsuite/tests/simplCore/should_compile/all.T | 122 ++++++++------------- 2 files changed, 48 insertions(+), 77 deletions(-) (limited to 'testsuite/tests/simplCore') diff --git a/testsuite/tests/simplCore/should_compile/T16038/test.T b/testsuite/tests/simplCore/should_compile/T16038/test.T index be525b25b0..f51b64d441 100644 --- a/testsuite/tests/simplCore/should_compile/T16038/test.T +++ b/testsuite/tests/simplCore/should_compile/T16038/test.T @@ -1,4 +1,3 @@ test('T16038', [extra_files(['A.hs', 'A.hs-boot', 'B.hs'])], - run_command, - ['$MAKE -s --no-print-directory T16038']) + makefile_test, []) diff --git a/testsuite/tests/simplCore/should_compile/all.T b/testsuite/tests/simplCore/should_compile/all.T index 1f6ef0059f..06b5e48447 100644 --- a/testsuite/tests/simplCore/should_compile/all.T +++ b/testsuite/tests/simplCore/should_compile/all.T @@ -45,8 +45,7 @@ test('T1647', normal, compile, ['-fdicts-strict -dcore-lint']) test('T3234', normal, - run_command, - ['$MAKE -s --no-print-directory T3234']) + makefile_test, ['T3234']) test('T3717', only_ways(['optasm']), compile, @@ -63,35 +62,32 @@ test('T4930', only_ways(['optasm']), compile, ['-O -ddump-simpl -dsuppress-uniques']) -test('T3055', [], run_command, ['$MAKE -s --no-print-directory T3055']) +test('T3055', [], makefile_test, ['T3055']) test('T4306', normal, - run_command, - ['$MAKE -s --no-print-directory T4306']) + makefile_test, ['T4306']) test('T4201', normal, - run_command, - ['$MAKE -s --no-print-directory T4201']) + makefile_test, ['T4201']) test('T3772', # only_ways(['optasm']), extra_clean(['T3772_A.hi', 'T3772_A.o']), - run_command, ['$MAKE -s --no-print-directory T3772']) + makefile_test, ['T3772']) test('EvalTest', normal, - run_command, - ['$MAKE -s --no-print-directory EvalTest']) + makefile_test, ['EvalTest']) test('T3831', normal, compile, ['']) test('T4345', normal, compile, ['']) test('T4398', normal, compile, ['-dsuppress-uniques']) -test('T4903', [], run_command, ['$MAKE -s --no-print-directory T4903']) +test('T4903', [], makefile_test, ['T4903']) -test('T4918', [], run_command, ['$MAKE -s --no-print-directory T4918']) +test('T4918', [], makefile_test, ['T4918']) # This test flips too and fro about whether it passes # I'm not sure why it is so delicate, but it greps the @@ -99,18 +95,15 @@ test('T4918', [], run_command, ['$MAKE -s --no-print-directory T4918']) # be very stable test('T4945', normal, - run_command, - ['$MAKE -s --no-print-directory T4945']) + makefile_test, ['T4945']) test('T4957', normal, - run_command, - ['$MAKE -s --no-print-directory T4957']) + makefile_test, ['T4957']) test('T5168', normal, - run_command, - ['$MAKE -s --no-print-directory T5168']) + makefile_test, ['T5168']) test('T5329', normal, compile, ['']) test('T5303', normal, compile, ['']) # Coercion-optimisation test @@ -118,32 +111,29 @@ test('T5342', normal, compile, ['']) # Lint error with -prof test('T5359a', normal, compile, ['']) # Lint error with -O (OccurAnal) test('T5359b', normal, compile, ['']) # Lint error with -O (OccurAnal) test('T5458', normal, compile, ['']) -test('simpl021', [extra_files(['Simpl021A.hs', 'Simpl021B.hs'])], run_command, ['$MAKE -s --no-print-directory simpl021']) -test('T5327', normal, run_command, ['$MAKE -s --no-print-directory T5327']) -test('T5615', normal, run_command, ['$MAKE -s --no-print-directory T5615']) -test('T5623', normal, run_command, ['$MAKE -s --no-print-directory T5623']) -test('T13155', normal, run_command, ['$MAKE -s --no-print-directory T13155']) +test('simpl021', [extra_files(['Simpl021A.hs', 'Simpl021B.hs'])], makefile_test, ['simpl021']) +test('T5327', normal, makefile_test, ['T5327']) +test('T5615', normal, makefile_test, ['T5615']) +test('T5623', normal, makefile_test, ['T5623']) +test('T13155', normal, makefile_test, ['T13155']) test('T5658b', normal, - run_command, - ['$MAKE -s --no-print-directory T5658b']) + makefile_test, ['T5658b']) test('T5776', normal, - run_command, - ['$MAKE -s --no-print-directory T5776']) -test('T4138', [], run_command, ['$MAKE -s --no-print-directory T4138']) + makefile_test, ['T5776']) +test('T4138', [], makefile_test, ['T4138']) test('T7088', normal, compile, ['']) test('T6082-RULE', normal, compile, ['']) -test('T7165', [], run_command, ['$MAKE -s --no-print-directory T7165']) +test('T7165', [], makefile_test, ['T7165']) test('T7287', normal, compile, ['']) test('T7360', only_ways(['optasm']), compile, ['-ddump-simpl -dsuppress-uniques']) test('T5366', normal, - run_command, - ['$MAKE -s --no-print-directory T5366']) -test('T7796', [], run_command, ['$MAKE -s --no-print-directory T7796']) + makefile_test, ['T5366']) +test('T7796', [], makefile_test, ['T7796']) test('T5550', omit_ways(prof_ways), compile, ['']) -test('T7865', normal, run_command, ['$MAKE -s --no-print-directory T7865']) +test('T7865', normal, makefile_test, ['T7865']) test('T7785', only_ways(['optasm']), compile, ['-ddump-rules']) test('T7702', [extra_files(['T7702plugin']), @@ -171,27 +161,23 @@ test('T7995', # RULE doesn't seem to fire unless optimizations are turned on. # This seems reasonable, so I've required it for the test. -- EZY 20130720 only_ways(['optasm']), - run_command, - ['$MAKE -s --no-print-directory T7995']) + makefile_test, ['T7995']) test('T8196', normal, compile, ['']) test('T8221b', normal, compile, ['']) -test('T8221', [], run_command, ['$MAKE -s --no-print-directory T8221']) -test('T8274', normal, run_command, ['$MAKE -s --no-print-directory T8274']) +test('T8221', [], makefile_test, ['T8221']) +test('T8274', normal, makefile_test, ['T8274']) test('T8329', only_ways(['optasm']), multimod_compile, ['T8329','-v0 -O']) test('T5996', normal, - run_command, - ['$MAKE -s --no-print-directory T5996']) + makefile_test, ['T5996']) test('T8537', normal, compile, ['']) test('T8832', normal, - run_command, - ['$MAKE -s --no-print-directory T8832 T8832_WORDSIZE_OPTS=' + + run_command, ['$MAKE -s --no-print-directory T8832 T8832_WORDSIZE_OPTS=' + ('-DT8832_WORDSIZE_64' if wordsize(64) else '')]) test('T8848', normal, - run_command, - ['$MAKE -s --no-print-directory T8848']) + makefile_test, ['T8848']) test('T8848a', only_ways(['optasm']), compile, ['-ddump-rules']) test('T8331', only_ways(['optasm']), compile, ['-ddump-rules']) test('T6056', only_ways(['optasm']), multimod_compile, ['T6056', '-v0 -ddump-rule-firings']) @@ -209,21 +195,18 @@ test('T10627', only_ways(['optasm']), compile, ['']) test('T10181', [only_ways(['optasm'])], compile, ['']) test('T10083', normal, - run_command, - ['$MAKE -s --no-print-directory T10083']) + makefile_test, ['T10083']) test('T10689', normal, compile, ['']) test('T11155', normal, - run_command, - ['$MAKE -s --no-print-directory T11155']) + makefile_test, ['T11155']) test('T11232', normal, compile, ['-O2']) test('T11562', normal, compile, ['-O2']) test('T11742', normal, compile, ['-O2']) test('T11644', normal, compile, ['-O2']) test('T3990', normal, - run_command, - ['$MAKE -s --no-print-directory T3990']) + makefile_test, ['T3990']) test('T12076', [], multimod_compile, ['T12076', '-v0']) test('T12076lit', normal, compile, ['-O']) @@ -235,49 +218,41 @@ test('par01', only_ways(['optasm']), compile, ['-ddump-prep -dsuppress-uniques - test('T12776', normal, compile, ['-O2']) test('T9509', normal, - run_command, - ['$MAKE -s --no-print-directory T9509']) + makefile_test, ['T9509']) test('T12603', normal, - run_command, - ['$MAKE -s --no-print-directory T12603']) -test('T12877', normal, run_command, ['$MAKE -s --no-print-directory T12877']) + makefile_test, ['T12603']) +test('T12877', normal, makefile_test, ['T12877']) test('T13027', normal, compile, ['']) test('T13025', normal, - run_command, - ['$MAKE -s --no-print-directory T13025']) + makefile_test, ['T13025']) test('T13143', only_ways(['optasm']), compile, ['-O -ddump-simpl -dsuppress-uniques']) -test('T13156', normal, run_command, ['$MAKE -s --no-print-directory T13156']) +test('T13156', normal, makefile_test, ['T13156']) test('T11444', normal, compile, ['']) test('str-rules', normal, - run_command, - ['$MAKE -s --no-print-directory str-rules']) + makefile_test, ['str-rules']) test('T13170', only_ways(['optasm']), compile, ['-dcore-lint']) test('T13317', normal, - run_command, - ['$MAKE -s --no-print-directory T13317']) -test('T13340', normal, run_command, ['$MAKE -s --no-print-directory T13340']) + makefile_test, ['T13317']) +test('T13340', normal, makefile_test, ['T13340']) test('T13338', only_ways(['optasm']), compile, ['-dcore-lint']) -test('T13367', normal, run_command, ['$MAKE -s --no-print-directory T13367']) +test('T13367', normal, makefile_test, ['T13367']) test('T13417', normal, compile, ['-O']) test('T13413', normal, compile, ['']) test('T13410', normal, compile, ['-O2']) test('T13468', normal, - run_command, - ['$MAKE -s --no-print-directory T13468']) + makefile_test, ['T13468']) test('T13543', only_ways(['optasm']), compile, ['-ddump-str-signatures']) test('T11272', normal, - run_command, - ['$MAKE -s --no-print-directory T11272']) + makefile_test, ['T11272']) test('T12600', normal, - run_command, - ['$MAKE -s --no-print-directory T12600']) + makefile_test, ['T12600']) test('T13658', [when((arch('powerpc64') or arch('powerpc64le')), expect_broken(11261))], compile, ['-dcore-lint']) @@ -297,8 +272,7 @@ test('T14186', [ only_ways(['optasm']), check_errmsg(r'bar = foo') ], compile, [ test('T14140', normal, - run_command, - ['$MAKE -s --no-print-directory T14140']) + makefile_test, ['T14140']) test('T14272', normal, compile, ['']) test('T14270a', normal, compile, ['']) @@ -311,8 +285,7 @@ test('T14650', normal, compile, ['-O2']) test('T14959', normal, compile, ['-O']) test('T14978', normal, - run_command, - ['$MAKE -s --no-print-directory T14978']) + makefile_test, ['T14978']) test('T15002', [ req_profiling ], compile, ['-O -fprof-auto -prof']) test('T15005', normal, compile, ['-O']) # we omit profiling because it affects the optimiser and makes the test fail @@ -324,6 +297,5 @@ test('T15453', normal, compile, ['-dcore-lint -O1']) test('T15445', normal, multimod_compile, ['T15445', '-v0 -O -ddump-rule-firings']) test('T15631', normal, - run_command, - ['$MAKE -s --no-print-directory T15631']) + makefile_test, ['T15631']) test('T15673', normal, compile, ['-O']) -- cgit v1.2.1