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/ghc-api | |
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/ghc-api')
-rw-r--r-- | testsuite/tests/ghc-api/T10052/all.T | 2 | ||||
-rw-r--r-- | testsuite/tests/ghc-api/T4891/all.T | 2 | ||||
-rw-r--r-- | testsuite/tests/ghc-api/T7478/all.T | 4 | ||||
-rw-r--r-- | testsuite/tests/ghc-api/all.T | 10 | ||||
-rw-r--r-- | testsuite/tests/ghc-api/annotations-literals/all.T | 4 | ||||
-rw-r--r-- | testsuite/tests/ghc-api/annotations/all.T | 65 | ||||
-rw-r--r-- | testsuite/tests/ghc-api/apirecomp001/all.T | 3 | ||||
-rw-r--r-- | testsuite/tests/ghc-api/show-srcspan/all.T | 2 |
8 files changed, 44 insertions, 48 deletions
diff --git a/testsuite/tests/ghc-api/T10052/all.T b/testsuite/tests/ghc-api/T10052/all.T index e76eae0705..7913ba4b4e 100644 --- a/testsuite/tests/ghc-api/T10052/all.T +++ b/testsuite/tests/ghc-api/T10052/all.T @@ -1,3 +1,3 @@ test('T10052', [when(arch('powerpc64') or arch('powerpc64le'), expect_broken(11259)), req_interp], - run_command, ['$MAKE -s --no-print-directory T10052']) + makefile_test, ['T10052']) diff --git a/testsuite/tests/ghc-api/T4891/all.T b/testsuite/tests/ghc-api/T4891/all.T index 1e61d62c6c..c179398c33 100644 --- a/testsuite/tests/ghc-api/T4891/all.T +++ b/testsuite/tests/ghc-api/T4891/all.T @@ -1 +1 @@ -test('T4891', [extra_files(['X.hs'])], run_command, ['$MAKE -s --no-print-directory T4891']) +test('T4891', [extra_files(['X.hs'])], makefile_test, ['T4891']) diff --git a/testsuite/tests/ghc-api/T7478/all.T b/testsuite/tests/ghc-api/T7478/all.T index e4b43d0114..0b6346c4a8 100644 --- a/testsuite/tests/ghc-api/T7478/all.T +++ b/testsuite/tests/ghc-api/T7478/all.T @@ -1,3 +1,3 @@ test('T7478', [extra_files(['A.hs', 'B.hs', 'C.hs']), - unless(have_dynamic(), skip)], run_command, - ['$MAKE -s --no-print-directory T7478']) + unless(have_dynamic(), skip)], + makefile_test, ['T7478']) diff --git a/testsuite/tests/ghc-api/all.T b/testsuite/tests/ghc-api/all.T index 377c1e3987..b4e24ec2fd 100644 --- a/testsuite/tests/ghc-api/all.T +++ b/testsuite/tests/ghc-api/all.T @@ -1,15 +1,11 @@ test('ghcApi', normal, compile_and_run, ['-package ghc']) -test('T6145', normal, - run_command, - ['$MAKE -s --no-print-directory T6145']) +test('T6145', normal, makefile_test, ['T6145']) test('T8639_api', when(arch('powerpc64') or arch('powerpc64le'), expect_broken(11259)), - run_command, - ['$MAKE -s --no-print-directory T8639_api']) + makefile_test, ['T8639_api']) test('T8628', when(arch('powerpc64') or arch('powerpc64le'), expect_broken(11259)), - run_command, - ['$MAKE -s --no-print-directory T8628']) + makefile_test, ['T8628']) test('T9595', extra_run_opts('"' + config.libdir + '"'), compile_and_run, ['-package ghc']) diff --git a/testsuite/tests/ghc-api/annotations-literals/all.T b/testsuite/tests/ghc-api/annotations-literals/all.T index c8c511f256..75284e5a97 100644 --- a/testsuite/tests/ghc-api/annotations-literals/all.T +++ b/testsuite/tests/ghc-api/annotations-literals/all.T @@ -1,2 +1,2 @@ -test('literals', [extra_files(['LiteralsTest.hs'])], run_command, ['$MAKE -s --no-print-directory literals']) -test('parsed', [extra_files(['LiteralsTest2.hs'])], run_command, ['$MAKE -s --no-print-directory parsed']) +test('literals', [extra_files(['LiteralsTest.hs'])], makefile_test, ['literals']) +test('parsed', [extra_files(['LiteralsTest2.hs'])], makefile_test, ['parsed']) diff --git a/testsuite/tests/ghc-api/annotations/all.T b/testsuite/tests/ghc-api/annotations/all.T index 49f0780021..97c3c60c21 100644 --- a/testsuite/tests/ghc-api/annotations/all.T +++ b/testsuite/tests/ghc-api/annotations/all.T @@ -1,65 +1,66 @@ test('annotations', [extra_files(['AnnotationLet.hs']), - ignore_stderr], run_command, ['$MAKE -s --no-print-directory annotations']) + ignore_stderr], makefile_test, ['annotations']) test('parseTree', [extra_files(['AnnotationTuple.hs']), - ignore_stderr], run_command, ['$MAKE -s --no-print-directory parseTree']) + ignore_stderr], makefile_test, ['parseTree']) test('comments', [extra_files(['CommentsTest.hs']), - ignore_stderr], run_command, ['$MAKE -s --no-print-directory comments']) + ignore_stderr], makefile_test, ['comments']) test('exampleTest', [extra_files(['AnnotationTuple.hs']), - ignore_stderr], run_command, ['$MAKE -s --no-print-directory exampleTest']) + ignore_stderr], makefile_test, ['exampleTest']) test('listcomps', [extra_files(['ListComprehensions.hs']), - ignore_stderr], run_command, ['$MAKE -s --no-print-directory listcomps']) + ignore_stderr], makefile_test, ['listcomps']) test('T10255', [extra_files(['Test10255.hs']), - ignore_stderr], run_command, ['$MAKE -s --no-print-directory T10255']) + ignore_stderr], makefile_test, ['T10255']) test('T10268', [extra_files(['Test10268.hs']), - ignore_stderr], run_command, ['$MAKE -s --no-print-directory T10268']) + ignore_stderr], makefile_test, ['T10268']) test('T10269', [extra_files(['Test10269.hs']), - ignore_stderr], run_command, ['$MAKE -s --no-print-directory T10269']) + ignore_stderr], makefile_test, ['T10269']) test('T10280', [extra_files(['Test10280.hs']), - ignore_stderr], run_command, ['$MAKE -s --no-print-directory T10280']) + ignore_stderr], makefile_test, ['T10280']) test('T10312', [extra_files(['Test10312.hs']), - ignore_stderr], run_command, ['$MAKE -s --no-print-directory T10312']) + ignore_stderr], makefile_test, ['T10312']) test('T10307', [extra_files(['Test10307.hs']), - ignore_stderr], run_command, ['$MAKE -s --no-print-directory T10307']) + ignore_stderr], makefile_test, ['T10307']) test('T10309', [extra_files(['Test10309.hs']), - ignore_stderr], run_command, ['$MAKE -s --no-print-directory T10309']) + ignore_stderr], makefile_test, ['T10309']) test('boolFormula', [extra_files(['TestBoolFormula.hs']), - ignore_stderr], run_command, ['$MAKE -s --no-print-directory boolFormula']) + ignore_stderr], makefile_test, ['boolFormula']) test('T10357', [extra_files(['Test10357.hs']), - ignore_stderr], run_command, ['$MAKE -s --no-print-directory T10357']) + ignore_stderr], makefile_test, ['T10357']) test('T10358', [extra_files(['Test10358.hs']), - ignore_stderr], run_command, ['$MAKE -s --no-print-directory T10358']) + ignore_stderr], makefile_test, ['T10358']) test('T10278', [extra_files(['Test10278.hs']), - ignore_stderr], run_command, ['$MAKE -s --no-print-directory T10278']) + ignore_stderr], makefile_test, ['T10278']) test('T10354', [extra_files(['Test10354.hs']), - ignore_stderr], run_command, ['$MAKE -s --no-print-directory T10354']) + ignore_stderr], makefile_test, ['T10354']) test('T10396', [extra_files(['Test10396.hs']), - ignore_stderr], run_command, ['$MAKE -s --no-print-directory T10396']) + ignore_stderr], makefile_test, ['T10396']) test('T10399', [extra_files(['Test10399.hs']), - ignore_stderr], run_command, ['$MAKE -s --no-print-directory T10399']) + ignore_stderr], makefile_test, ['T10399']) test('T10313', [extra_files(['Test10313.hs', 'stringSource.hs']), - ignore_stderr], run_command, ['$MAKE -s --no-print-directory T10313']) + ignore_stderr], makefile_test, ['T10313']) # Stricter tests from trac #16217 now causes this to fail. Will be fixed for trac #16212 -test('T11018', [expect_broken(11018),extra_files(['Test11018.hs']), - ignore_stderr], run_command, ['$MAKE -s --no-print-directory T11018']) +test('T11018', [expect_broken(11018), + extra_files(['Test11018.hs']), + ignore_stderr], makefile_test, ['T11018']) test('bundle-export', [extra_files(['BundleExport.hs']), - ignore_stderr], run_command, ['$MAKE -s --no-print-directory bundle-export']) + ignore_stderr], makefile_test, ['bundle-export']) test('T10276', [extra_files(['Test10276.hs']), - ignore_stderr], run_command, ['$MAKE -s --no-print-directory T10276']) + ignore_stderr], makefile_test, ['T10276']) test('T10598', [extra_files(['Test10598.hs']), - ignore_stderr], run_command, ['$MAKE -s --no-print-directory T10598']) + ignore_stderr], makefile_test, ['T10598']) test('T11321', [extra_files(['Test11321.hs']), - ignore_stderr], run_command, ['$MAKE -s --no-print-directory T11321']) + ignore_stderr], makefile_test, ['T11321']) test('T11332', [extra_files(['Test11332.hs']), - ignore_stderr], run_command, ['$MAKE -s --no-print-directory T11332']) + ignore_stderr], makefile_test, ['T11332']) test('T11430', [extra_files(['Test11430.hs', 't11430.hs']), - ignore_stderr], run_command, ['$MAKE -s --no-print-directory T11430']) -test('load-main', ignore_stderr, run_command, ['$MAKE -s --no-print-directory load-main']) + ignore_stderr], makefile_test, ['T11430']) +test('load-main', ignore_stderr, makefile_test, ['load-main']) test('T12417', [extra_files(['Test12417.hs']), - ignore_stderr], run_command, ['$MAKE -s --no-print-directory T12417']) + ignore_stderr], makefile_test, ['T12417']) test('T13163', [extra_files(['Test13163.hs']), - ignore_stderr], run_command, ['$MAKE -s --no-print-directory T13163']) + ignore_stderr], makefile_test, ['T13163']) test('T15303', [extra_files(['Test15303.hs']), - ignore_stderr], run_command, ['$MAKE -s --no-print-directory T15303']) + ignore_stderr], makefile_test, ['T15303']) # Stricter tests from trac #16217 now causes this to fail. Will be fixed for trac #16212 test('T16212', [expect_broken(16212),extra_files(['Test16212.hs']), ignore_stderr], run_command, ['$MAKE -s --no-print-directory T16212']) diff --git a/testsuite/tests/ghc-api/apirecomp001/all.T b/testsuite/tests/ghc-api/apirecomp001/all.T index 7b17e138f4..363f9c05ab 100644 --- a/testsuite/tests/ghc-api/apirecomp001/all.T +++ b/testsuite/tests/ghc-api/apirecomp001/all.T @@ -1,4 +1,3 @@ test('apirecomp001', extra_files(['A.hs', 'B.hs', 'myghc.hs']), - run_command, - ['$MAKE -s --no-print-directory apirecomp001']) + makefile_test, ['apirecomp001']) diff --git a/testsuite/tests/ghc-api/show-srcspan/all.T b/testsuite/tests/ghc-api/show-srcspan/all.T index 100b3f03ea..3f9fb75287 100644 --- a/testsuite/tests/ghc-api/show-srcspan/all.T +++ b/testsuite/tests/ghc-api/show-srcspan/all.T @@ -1 +1 @@ -test('showsrcspan', normal, run_command, ['$MAKE -s --no-print-directory showsrcspan']) +test('showsrcspan', normal, makefile_test, ['showsrcspan']) |