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/deriving | |
| 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/deriving')
| -rw-r--r-- | testsuite/tests/deriving/should_compile/all.T | 5 | ||||
| -rw-r--r-- | testsuite/tests/deriving/should_fail/all.T | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/testsuite/tests/deriving/should_compile/all.T b/testsuite/tests/deriving/should_compile/all.T index ef6259df54..656cc0de4b 100644 --- a/testsuite/tests/deriving/should_compile/all.T +++ b/testsuite/tests/deriving/should_compile/all.T @@ -40,7 +40,7 @@ test('deriving-via-compile', normal, compile, ['']) test('deriving-via-standalone', normal, compile, ['']) test('T6031', [], multimod_compile, ['T6031', '-v0 -O']) # Adding -O on T6031 to expose Trac #11245 regardless of way -test('T1133', [], run_command, ['$MAKE --no-print-directory -s T1133']) +test('T1133', [], makefile_test, []) test('T7704', normal, compile, ['']) test('T7710', normal, compile, ['']) @@ -65,8 +65,7 @@ test('T7947', [], multimod_compile, ['T7947', '-v0']) test('T10561', normal, compile, ['']) test('T10487', [], multimod_compile, ['T10487', '-v0']) test('T10524', normal, compile, ['']) -test('T11148', normal, run_command, - ['$MAKE -s --no-print-directory T11148']) +test('T11148', normal, makefile_test, []) test('T9968', normal, compile, ['']) test('T9968a', normal, compile, ['']) test('T11174', normal, compile, ['']) diff --git a/testsuite/tests/deriving/should_fail/all.T b/testsuite/tests/deriving/should_fail/all.T index 0cc85ea4aa..1f674805a3 100644 --- a/testsuite/tests/deriving/should_fail/all.T +++ b/testsuite/tests/deriving/should_fail/all.T @@ -12,8 +12,7 @@ test('drvfail011', normal, compile_fail, ['']) test('drvfail012', normal, compile_fail, ['']) test('drvfail013', normal, compile_fail, ['']) test('drvfail015', normal, compile_fail, ['']) -test('drvfail016', [], run_command, - ['$MAKE --no-print-directory -s drvfail016']) +test('drvfail016', [], makefile_test, []) test('T1830_1', normal, compile_fail, ['']) test('T2394', normal, compile_fail, ['']) # T2604 was removed as it was out of date re: fixing #9858 @@ -33,7 +32,7 @@ test('T5287', normal, compile_fail, ['']) test('T5478', normal, compile_fail, ['']) test('T5686', normal, compile_fail, ['']) test('T5922', normal, compile_fail, ['']) -test('T1133A', [], run_command, ['$MAKE --no-print-directory -s T1133A']) +test('T1133A', [], makefile_test, []) # 5863a was removed as it was out of date re: fixing #9858 test('T7959', normal, compile_fail, ['']) |