diff options
author | Ben Gamari <ben@smart-cactus.org> | 2019-01-20 23:46:13 -0500 |
---|---|---|
committer | Ben Gamari <ben@smart-cactus.org> | 2019-01-30 10:06:31 -0500 |
commit | 513a449c9dd10887d6dc757d55286749b2594b09 (patch) | |
tree | 2c7e4be10c5b676885932789457f64738748db2e /testsuite/tests/typecheck/should_compile | |
parent | bdb559a60a18318b6130f399f158739118237f9b (diff) | |
download | haskell-513a449c9dd10887d6dc757d55286749b2594b09.tar.gz |
testsuite: Use makefile_test
This eliminates most uses of run_command in the testsuite in favor of the more
structured makefile_test.
Diffstat (limited to 'testsuite/tests/typecheck/should_compile')
-rw-r--r-- | testsuite/tests/typecheck/should_compile/all.T | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/testsuite/tests/typecheck/should_compile/all.T b/testsuite/tests/typecheck/should_compile/all.T index b032121ad7..5146dbc00e 100644 --- a/testsuite/tests/typecheck/should_compile/all.T +++ b/testsuite/tests/typecheck/should_compile/all.T @@ -171,13 +171,13 @@ test('tc167', normal, compile, ['']) test('tc168', normal, compile_fail, ['']) test('tc169', normal, compile, ['']) -test('tc170', [extra_files(['Tc170_Aux.hs'])], run_command, ['$MAKE -s --no-print-directory tc170']) +test('tc170', [extra_files(['Tc170_Aux.hs'])], makefile_test, []) test('tc171', normal, compile, ['']) test('tc172', normal, compile, ['']) # The point about this test is that it compiles Tc173a and Tc173b *separately* -test('tc173', [extra_files(['Tc173a.hs', 'Tc173b.hs'])], run_command, ['$MAKE -s --no-print-directory tc173']) +test('tc173', [extra_files(['Tc173a.hs', 'Tc173b.hs'])], makefile_test, []) test('tc174', normal, compile, ['']) test('tc175', normal, compile, ['']) @@ -255,7 +255,7 @@ test('tc241', normal, compile, ['']) test('tc242', normal, compile, ['']) test('tc243', normal, compile, ['']) test('tc244', normal, compile, ['']) -test('tc245', [extra_files(['Tc245_A.hs'])], run_command, ['$MAKE -s --no-print-directory tc245']) +test('tc245', [extra_files(['Tc245_A.hs'])], makefile_test, []) test('tc246', normal, compile, ['']) test('tc247', normal, compile, ['']) test('tc248', normal, compile, ['']) @@ -295,7 +295,7 @@ test('T3955', normal, compile, ['']) test('PolyRec', normal, compile, ['']) test('twins', normal, compile, ['']) -test('T2412', [], run_command, ['$MAKE --no-print-directory -s T2412']) +test('T2412', [], makefile_test, []) test('T2846', normal, compile, ['']) test('T4284', normal, compile, ['']) @@ -338,12 +338,12 @@ test('tc261', normal, compile, ['']) test('tc262', normal, compile, ['']) test('tc263', [extra_files(['Tc263_Help.hs'])], multimod_compile, ['tc263', '-v0']) test('tc265', normal, compile, ['']) -test('tc266', [extra_files(['Tc266.hs', 'Tc266a.hs', 'Tc266.hs-boot'])], run_command, ['$MAKE -s --no-print-directory tc266']) -test('Tc267', [extra_files(['Tc267a.hs', 'Tc267b.hs', 'Tc267a.hs-boot', 'Tc267b.hs-boot'])], run_command, ['$MAKE -s --no-print-directory Tc267']) +test('tc266', [extra_files(['Tc266.hs', 'Tc266a.hs', 'Tc266.hs-boot'])], makefile_test, []) +test('Tc267', [extra_files(['Tc267a.hs', 'Tc267b.hs', 'Tc267a.hs-boot', 'Tc267b.hs-boot'])], makefile_test, []) test('tc268', normal, compile, ['']) test('tc269', normal, compile, ['']) test('tc270', normal, compile, ['']) -test('Tc271', [extra_files(['Tc271a.hs', 'Tc271.hs', 'Tc271.hs-boot'])], run_command, ['$MAKE -s --no-print-directory Tc271']) +test('Tc271', [extra_files(['Tc271a.hs', 'Tc271.hs', 'Tc271.hs-boot'])], makefile_test, []) test('GivenOverlapping', normal, compile, ['']) test('GivenTypeSynonym', normal, compile, ['']) @@ -362,8 +362,7 @@ test('T5676', normal, compile, ['']) test('T4310', normal, compile, ['']) test('T3108', normal, compile, ['']) -test('T5792',normal,run_command, - ['$MAKE -s --no-print-directory T5792']) +test('T5792',normal, makefile_test, []) test('PolytypeDecomp', normal, compile, ['']) test('T6011', normal, compile, ['']) @@ -375,8 +374,7 @@ test('T6134', normal, compile, ['']) test('T6018', [], multimod_compile, ['T6018', '']) test('TcLambdaCase', [], compile, ['']) test('T7147', normal, compile, ['']) -test('T7171',normal,run_command, - ['$MAKE -s --no-print-directory T7171']) +test('T7171',normal, makefile_test, []) test('T7173', normal, compile, ['']) test('T7196', normal, compile, ['']) test('T7050', normal, compile, ['-O']) @@ -574,7 +572,7 @@ test('T13526', normal, compile, ['']) test('T13594', normal, compile_fail, ['']) test('T13603', normal, compile, ['']) test('T13333', normal, compile, ['']) -test('T13585', [extra_files(['T13585.hs', 'T13585a.hs', 'T13585b.hs'])], run_command, ['$MAKE -s --no-print-directory T13585']) +test('T13585', [extra_files(['T13585.hs', 'T13585a.hs', 'T13585b.hs'])], makefile_test, []) test('T13651', normal, compile_fail, ['']) test('T13651a', normal, compile, ['']) test('T13680', normal, compile, ['']) @@ -598,7 +596,7 @@ test('T14363', normal, compile, ['']) test('T14363a', normal, compile, ['']) test('T7169', normal, compile, ['']) test('T14396', [extra_files(['T14396.hs', 'T14396.hs-boot', 'T14396a.hs', 'T14396b.hs', 'T14396f.hs'])], multimod_compile, ['T14396', '-v0']) -test('T14434', [], run_command, ['$MAKE -s --no-print-directory T14434']) +test('T14434', [], makefile_test, []) test('MissingExportList01', normal, compile, ['']) test('MissingExportList02', normal, compile, ['']) test('T14451', normal, compile, ['']) @@ -612,11 +610,10 @@ test('T13032', omit_ways(['hpc', 'profasm']), compile, ['']) test('T14273', normal, compile, ['-fdefer-type-errors -fno-max-valid-hole-fits']) test('T14366', normal, compile, ['']) test('T14732', normal, compile, ['']) -test('T14774', [], run_command, ['$MAKE -s --no-print-directory T14774']) +test('T14774', [], makefile_test, []) test('T14763', normal, compile, ['']) test('T14811', normal, compile, ['']) -test('T14934', [extra_files(['T14934.hs', 'T14934a.hs'])], run_command, - ['$MAKE -s --no-print-directory T14934']) +test('T14934', [extra_files(['T14934.hs', 'T14934a.hs'])], makefile_test, []) test('T13643', normal, compile, ['']) test('SplitWD', normal, compile, ['']) # we omit profasm because it fails with: |