diff options
Diffstat (limited to 'testsuite/tests/rts/T11223/all.T')
| -rw-r--r-- | testsuite/tests/rts/T11223/all.T | 45 |
1 files changed, 15 insertions, 30 deletions
diff --git a/testsuite/tests/rts/T11223/all.T b/testsuite/tests/rts/T11223/all.T index 6656e7fa34..1fc09e3cfd 100644 --- a/testsuite/tests/rts/T11223/all.T +++ b/testsuite/tests/rts/T11223/all.T @@ -15,59 +15,50 @@ def normalise_duplicate_errmsg( msg ): test('T11223_simple_link', [extra_files(['foo.c', 'foo.hs']), when(ghc_dynamic(), skip)], - run_command, - ['$MAKE -s --no-print-directory t_11223_simple_link']) + makefile_test, ['t_11223_simple_link']) test('T11223_simple_link_lib', [extra_files(['foo.c', 'foo.hs']), when(ghc_dynamic(), skip)], - run_command, - ['$MAKE -s --no-print-directory t_11223_simple_link_lib']) + makefile_test, ['t_11223_simple_link_lib']) # I'm ignoring the output since for this particular invocation normalise_errmsg # isn't being called and I can't figure out why not. test('T11223_simple_duplicate', [extra_files(['bar.c', 'foo.c', 'foo.hs']), when(ghc_dynamic(), skip), ignore_stderr, ignore_stdout, exit_code(2), normalise_errmsg_fun(normalise_duplicate_errmsg)], - run_command, - ['$MAKE -s --no-print-directory t_11223_simple_duplicate']) + makefile_test, ['t_11223_simple_duplicate']) test('T11223_simple_duplicate_lib', [extra_files(['bar.c', 'foo.c', 'foo.hs']), when(platform('i386-unknown-mingw32'), expect_broken(13515)), when(ghc_dynamic(), skip), normalise_errmsg_fun(normalise_duplicate_errmsg)], - run_command, - ['$MAKE -s --no-print-directory t_11223_simple_duplicate_lib']) + makefile_test, ['t_11223_simple_duplicate_lib']) test('T11223_simple_unused_duplicate_lib', [extra_files(['bar.c', 'foo.c', 'foo.hs']), when(ghc_dynamic(), skip)], - run_command, - ['$MAKE -s --no-print-directory t_11223_simple_unused_duplicate_lib']) + makefile_test, ['t_11223_simple_unused_duplicate_lib']) test('T11223_link_order_a_b_succeed', [extra_files(['bar.c', 'foo.c', 'foo2.hs']), when(ghc_dynamic(), skip)], - run_command, - ['$MAKE -s --no-print-directory t_11223_link_order_a_b_succeed']) + makefile_test, ['t_11223_link_order_a_b_succeed']) test('T11223_link_order_b_a_succeed', [extra_files(['bar.c', 'foo.c', 'foo2.hs']), when(ghc_dynamic(), skip)], - run_command, - ['$MAKE -s --no-print-directory t_11223_link_order_b_a_succeed']) + makefile_test, ['t_11223_link_order_b_a_succeed']) test('T11223_link_order_a_b_2_fail', [extra_files(['bar.c', 'foo.c', 'foo3.hs']), when(ghc_dynamic(), skip), normalise_errmsg_fun(normalise_duplicate_errmsg)], - run_command, - ['$MAKE -s --no-print-directory t_11223_link_order_a_b_2_fail']) + makefile_test, ['t_11223_link_order_a_b_2_fail']) test('T11223_link_order_b_a_2_succeed', [extra_files(['bar.c', 'foo.c', 'foo3.hs']), when(ghc_dynamic(), skip)], - run_command, - ['$MAKE -s --no-print-directory t_11223_link_order_b_a_2_succeed']) + makefile_test, ['t_11223_link_order_b_a_2_succeed']) # Weak Symbols are not currently implemented. So Disable all the tests # See Note [weak-symbols-support] in Linker.c @@ -75,35 +66,29 @@ test('T11223_link_order_b_a_2_succeed', test('T11223_weak_only_link_fail', [extra_files(['power.c', 'power.hs']), when(ghc_dynamic(), skip), expect_broken(11817)], - run_command, - ['$MAKE -s --no-print-directory t_11223_weak_only_link_fail']) + makefile_test, ['t_11223_weak_only_link_fail']) test('T11223_weak_only_link_succeed', [extra_files(['power3.hs', 'power_slow.c']), when(ghc_dynamic(), skip), expect_broken(11817)], - run_command, - ['$MAKE -s --no-print-directory t_11223_weak_only_link_succeed']) + makefile_test, ['t_11223_weak_only_link_succeed']) test('T11223_weak_both_link_order_a_b_succeed', [extra_files(['power.c', 'power3.hs', 'power_slow.c']), when(ghc_dynamic(), skip), expect_broken(11817)], - run_command, - ['$MAKE -s --no-print-directory t_11223_weak_both_link_order_a_b_succeed']) + makefile_test, ['t_11223_weak_both_link_order_a_b_succeed']) test('T11223_weak_both_link_order_b_a_succeed', [extra_files(['power.c', 'power3.hs', 'power_slow.c']), when(ghc_dynamic(), skip), expect_broken(11817)], - run_command, - ['$MAKE -s --no-print-directory t_11223_weak_both_link_order_b_a_succeed']) + makefile_test, ['t_11223_weak_both_link_order_b_a_succeed']) test('T11223_weak_single_link_order_a_b_succeed', [extra_files(['power.c', 'power3.hs', 'power_slow.c']), when(ghc_dynamic(), skip), expect_broken(11817)], - run_command, - ['$MAKE -s --no-print-directory t_11223_weak_single_link_order_a_b_succeed']) + makefile_test, ['t_11223_weak_single_link_order_a_b_succeed']) test('T11223_weak_single_link_order_b_a_succeed', [extra_files(['power.c', 'power3.hs', 'power_slow.c']), when(ghc_dynamic(), skip), expect_broken(11817)], - run_command, - ['$MAKE -s --no-print-directory t_11223_weak_single_link_order_b_a_succeed']) + makefile_test, ['t_11223_weak_single_link_order_b_a_succeed']) |