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 /libraries | |
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 'libraries')
-rw-r--r-- | libraries/base/tests/IO/T12010/test.T | 3 | ||||
-rw-r--r-- | libraries/base/tests/IO/all.T | 9 |
2 files changed, 5 insertions, 7 deletions
diff --git a/libraries/base/tests/IO/T12010/test.T b/libraries/base/tests/IO/T12010/test.T index 73dac44c47..43403abe31 100644 --- a/libraries/base/tests/IO/T12010/test.T +++ b/libraries/base/tests/IO/T12010/test.T @@ -4,5 +4,4 @@ test('T12010', only_ways(['threaded1']), extra_ways(['threaded1']), cmd_prefix('WAY_FLAGS="' + ' '.join(config.way_flags['threaded1']) + '"')], - run_command, - ['$MAKE -s --no-print-directory T12010']) + makefile_test, []) diff --git a/libraries/base/tests/IO/all.T b/libraries/base/tests/IO/all.T index dba0e5e3d7..1912be7c94 100644 --- a/libraries/base/tests/IO/all.T +++ b/libraries/base/tests/IO/all.T @@ -89,14 +89,14 @@ test('hDuplicateTo001', [], compile_and_run, ['']) test('countReaders001', [], compile_and_run, ['']) test('concio001', [normal, multi_cpu_race], - run_command, ['$MAKE -s --no-print-directory test.concio001']) + makefile_test, ['test.concio001']) test('concio001.thr', [extra_files(['concio001.hs']), multi_cpu_race], - run_command, ['$MAKE -s --no-print-directory test.concio001.thr']) + makefile_test, ['test.concio001.thr']) test('concio002', reqlib('process'), compile_and_run, ['']) test('T2122', [], compile_and_run, ['']) -test('T3307', [], run_command, ['$MAKE -s --no-print-directory T3307-test']) +test('T3307', [], makefile_test, ['T3307-test']) test('T4855', normal, compile_and_run, ['']) test('hSetEncoding001',extra_run_opts('hSetEncoding001.in'), compile_and_run, ['']) @@ -118,8 +118,7 @@ test('encoding003', normal, compile_and_run, ['']) test('encoding004', extra_files(['encoded-data/']), compile_and_run, ['']) test('encoding005', normal, compile_and_run, ['']) -test('environment001', [], run_command, - ['$MAKE -s --no-print-directory environment001-test']) +test('environment001', [], makefile_test, ['environment001-test']) test('newline001', [], compile_and_run, ['']) |