diff options
Diffstat (limited to 'testsuite/tests/indexed-types')
6 files changed, 14 insertions, 32 deletions
diff --git a/testsuite/tests/indexed-types/should_compile/T13092b/all.T b/testsuite/tests/indexed-types/should_compile/T13092b/all.T index a3047a60e5..e5245ad9a3 100644 --- a/testsuite/tests/indexed-types/should_compile/T13092b/all.T +++ b/testsuite/tests/indexed-types/should_compile/T13092b/all.T @@ -1,5 +1,4 @@ # Test that we don't load all family instance interface files # when importing a module that defines a family instance -test('T13092b', ignore_stdout, - run_command, ['$MAKE -s --no-print-directory T13092b']) +test('T13092b', ignore_stdout, makefile_test, ['T13092b']) diff --git a/testsuite/tests/indexed-types/should_compile/all.T b/testsuite/tests/indexed-types/should_compile/all.T index 484d843672..dbebdf051d 100644 --- a/testsuite/tests/indexed-types/should_compile/all.T +++ b/testsuite/tests/indexed-types/should_compile/all.T @@ -39,7 +39,7 @@ test('Records', normal, compile, ['']) # The point about this test is that it compiles NewTyCo1 and NewTyCo2 # *separately* # -test('NewTyCo', [], run_command, ['$MAKE -s --no-print-directory NewTyCo']) +test('NewTyCo', [], makefile_test, ['NewTyCo']) test('Infix', normal, compile, ['']) test('Kind', normal, compile, ['']) @@ -130,8 +130,7 @@ test('IndTypesPerf', extra_clean(['IndTypesPerf.o', 'IndTypesPerf.hi', 'IndTypesPerfMerge.o', 'IndTypesPerfMerge.hi']) ] , - run_command, - ['$MAKE -s --no-print-directory IndTypesPerf']) + makefile_test, ['IndTypesPerf']) test('T4120', normal, compile, ['']) test('T3787', normal, compile, ['']) @@ -171,13 +170,9 @@ test('HO', normal, compile, ['']) # The point about this test is that it compiles the two T5955 # modules *separately* -test('T5955', [], run_command, ['$MAKE -s --no-print-directory T5955']) - -test('T6152', - normal, - run_command, - ['$MAKE -s --no-print-directory T6152']) +test('T5955', [], makefile_test, ['T5955']) +test('T6152', normal, makefile_test, ['T6152']) test('T7082', normal, compile, ['']) test('Overlap1', normal, compile, ['']) @@ -206,22 +201,13 @@ test('T7837', normal, compile, test('T4185', normal, compile, ['']) # Caused infinite loop in the compiler -test('T8002', - normal, - run_command, - ['$MAKE -s --no-print-directory T8002']) +test('T8002', normal, makefile_test, ['T8002']) # Import and export of associated types -test('T8011', - normal, - run_command, - ['$MAKE -s --no-print-directory T8011']) +test('T8011', normal, makefile_test, ['T8011']) # Marshalling of associated types -test('T8500', - normal, - run_command, - ['$MAKE -s --no-print-directory T8500']) +test('T8500', normal, makefile_test, ['T8500']) test('T8018', normal, compile, ['']) test('T8020', normal, compile, ['']) diff --git a/testsuite/tests/indexed-types/should_fail/T13092/all.T b/testsuite/tests/indexed-types/should_fail/T13092/all.T index 090d10db96..2f2d1db393 100644 --- a/testsuite/tests/indexed-types/should_fail/T13092/all.T +++ b/testsuite/tests/indexed-types/should_fail/T13092/all.T @@ -2,4 +2,4 @@ # with imported ones test('T13092', extra_files(['A.hs', 'B.hs', 'C.hs', 'Main.hs']), - run_command, ['$MAKE -s --no-print-directory T13092']) + makefile_test, ['T13092']) diff --git a/testsuite/tests/indexed-types/should_fail/T13092c/all.T b/testsuite/tests/indexed-types/should_fail/T13092c/all.T index c4e38be054..359bc0486e 100644 --- a/testsuite/tests/indexed-types/should_fail/T13092c/all.T +++ b/testsuite/tests/indexed-types/should_fail/T13092c/all.T @@ -5,4 +5,4 @@ # defined in T13092c_4, and would not be read otherwise.) test('T13092c', ignore_stdout, - run_command, ['$MAKE -s --no-print-directory T13092c']) + makefile_test, ['T13092c']) diff --git a/testsuite/tests/indexed-types/should_fail/T13102/all.T b/testsuite/tests/indexed-types/should_fail/T13102/all.T index bdde35430e..53564c176c 100644 --- a/testsuite/tests/indexed-types/should_fail/T13102/all.T +++ b/testsuite/tests/indexed-types/should_fail/T13102/all.T @@ -2,4 +2,4 @@ test('T13102', [expect_broken(13102), extra_files(['A.hs', 'B.hs', 'orphan'])], - run_command, ['$MAKE -s --no-print-directory T13102']) + makefile_test, ['T13102']) diff --git a/testsuite/tests/indexed-types/should_fail/all.T b/testsuite/tests/indexed-types/should_fail/all.T index 4f6863bc44..4e29910c21 100644 --- a/testsuite/tests/indexed-types/should_fail/all.T +++ b/testsuite/tests/indexed-types/should_fail/all.T @@ -86,7 +86,7 @@ test('Overlap11', normal, compile_fail, ['']) test('Overlap15', normal, compile_fail, ['']) test('T7194', normal, compile_fail, ['']) test('T7354', normal, compile_fail, ['']) -test('T7354a', [extra_files(['T7354b.hs'])], run_command, ['$MAKE -s --no-print-directory T7354a']) +test('T7354a', [extra_files(['T7354b.hs'])], makefile_test, ['T7354a']) test('T7536', normal, compile_fail, ['']) test('T7729', normal, compile_fail, ['']) @@ -100,11 +100,8 @@ test('T7938', normal, compile_fail, ['']) test('ClosedFam3', [], multimod_compile_fail, ['ClosedFam3', '-v0']) test('ClosedFam4', normal, compile_fail, ['']) test('T8155', normal, compile_fail, ['']) -test('T8227', [], run_command, ['$MAKE -s --no-print-directory T8227']) -test('T8129', - normal, - run_command, - ['$MAKE -s --no-print-directory T8129']) +test('T8227', [], makefile_test, ['T8227']) +test('T8129', normal, makefile_test, ['T8129']) test('T8368', normal, compile_fail, ['']) test('T8368a', normal, compile_fail, ['']) |