diff options
| author | Ben Gamari <ben@well-typed.com> | 2019-01-30 01:06:12 -0500 |
|---|---|---|
| committer | Ben Gamari <ben@well-typed.com> | 2019-01-30 01:06:12 -0500 |
| commit | 76c8fd674435a652c75a96c85abbf26f1f221876 (patch) | |
| tree | b02a6f5307a20efc25ddb27c58977069b48972b6 /testsuite/tests/perf | |
| parent | 7cdcd3e12a5c3a337e36fa80c64bd72e5ef79b24 (diff) | |
| download | haskell-76c8fd674435a652c75a96c85abbf26f1f221876.tar.gz | |
Batch merge
Diffstat (limited to 'testsuite/tests/perf')
| -rw-r--r-- | testsuite/tests/perf/compiler/all.T | 5 | ||||
| -rw-r--r-- | testsuite/tests/perf/should_run/all.T | 7 |
2 files changed, 4 insertions, 8 deletions
diff --git a/testsuite/tests/perf/compiler/all.T b/testsuite/tests/perf/compiler/all.T index b2ca109000..91037199be 100644 --- a/testsuite/tests/perf/compiler/all.T +++ b/testsuite/tests/perf/compiler/all.T @@ -98,10 +98,7 @@ test('T3064', compile, ['']) -test('T4007', - normal, - run_command, - ['$MAKE -s --no-print-directory T4007']) +test('T4007', normal, makefile_test, ['T4007']) test('T5030', [collect_compiler_stats('bytes allocated', 10), diff --git a/testsuite/tests/perf/should_run/all.T b/testsuite/tests/perf/should_run/all.T index 6095317ac1..2273ddd400 100644 --- a/testsuite/tests/perf/should_run/all.T +++ b/testsuite/tests/perf/should_run/all.T @@ -93,7 +93,7 @@ test('T4321', omit_ways(['ghci']), compile_and_run, ['-O ' + sse2_opts]) -test('T3736', [], run_command, ['$MAKE -s --no-print-directory T3736']) +test('T3736', [], makefile_test, ['T3736']) test('T3738', [extra_clean(['T3738a.hi', 'T3738a.o']), collect_stats('peak_megabytes_allocated', 0), @@ -110,15 +110,14 @@ test('MethSharing', ], compile_and_run, ['-O']) -test('T2902', [], run_command, ['$MAKE -s --no-print-directory T2902']) +test('T2902', [], makefile_test, ['T2902']) test('T149', [ # expect_broken(149), # working (2 Jul 2013, x86-64/Linux) extra_clean(['T149_A', 'T149_B', 'T149_A.hi', 'T149_B.hi', 'T149_A.o', 'T149_B.o'])], - run_command, - ['$MAKE -s --no-print-directory T149']) + makefile_test, ['T149']) test('T5113', [collect_stats('bytes allocated',5), |