From 9e89092d4ee1effd558757361fb62b83697f8f42 Mon Sep 17 00:00:00 2001 From: Andreas Klebinger Date: Fri, 13 Apr 2018 13:27:36 -0400 Subject: Omit ways depending on rts flags for #12870 related tests. Some of these tests instruct the RTS to ignore all RTS flags being passed. While this is intended it causes test failures for some ways like profiling which depend on passing RTS flags. So we skip these ways. Test Plan: testsuite/tests/rts/flags$ make slow Reviewers: bgamari, simonmar, alpmestan Reviewed By: alpmestan Subscribers: alpmestan, thomie, carter GHC Trac Issues: #12870 Differential Revision: https://phabricator.haskell.org/D4585 --- testsuite/tests/rts/flags/all.T | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/testsuite/tests/rts/flags/all.T b/testsuite/tests/rts/flags/all.T index 548fcd8631..6bfa14f962 100644 --- a/testsuite/tests/rts/flags/all.T +++ b/testsuite/tests/rts/flags/all.T @@ -1,51 +1,53 @@ +#We ignore ways which depend on passing RTS arguments for simplicity. + #Standard handling of RTS arguments test('T12870a', [extra_run_opts('+RTS -G2 -RTS arg1 --RTS +RTS arg2'), extra_files(['T12870.hs']), - omit_ways(['ghci'])], + omit_ways(['ghci','threaded2','profasm','profthreaded'])], multimod_compile_and_run, ['T12870', '-rtsopts']) test('T12870b', [extra_run_opts('+RTS -G2 -RTS arg1 --RTS +RTS arg2'), extra_files(['T12870.hs']), - exit_code(1), ignore_stderr, omit_ways(['ghci'])], + exit_code(1), ignore_stderr, omit_ways(['ghci','threaded2','profasm','profthreaded'])], multimod_compile_and_run, ['T12870', '-rtsopts=none']) test('T12870c', [extra_run_opts('+RTS -G2 -RTS arg1 --RTS +RTS arg2'), extra_files(['T12870.hs']), - exit_code(1), omit_ways(['ghci'])], + exit_code(1), omit_ways(['ghci','threaded2','profasm','profthreaded'])], multimod_compile_and_run, ['T12870', '-rtsopts=some']) test('T12870d', [extra_run_opts('+RTS -G2 -RTS arg1 --RTS +RTS arg2'), extra_files(['T12870.hs']), - omit_ways(['ghci'])], + omit_ways(['ghci','threaded2','profasm','profthreaded'])], multimod_compile_and_run, ['T12870', '']) #RTS options should be passed along to the program test('T12870e', [extra_run_opts('+RTS -G2 -RTS arg1 --RTS +RTS arg2'), extra_files(['T12870.hs']), - omit_ways(['ghci', 'threaded2'])], + omit_ways(['ghci','threaded2','profasm','profthreaded'])], multimod_compile_and_run, ['T12870', '-rtsopts=ignore']) test('T12870f', [extra_run_opts('+RTS -G2 -RTS arg1 --RTS +RTS arg2'), extra_files(['T12870.hs']), - omit_ways(['ghci', 'threaded2'])], + omit_ways(['ghci','threaded2','profasm','profthreaded'])], multimod_compile_and_run, ['T12870', '-rtsopts=ignoreAll']) #Check handling of env variables test('T12870g', [extra_files(['T12870g.hs']), cmd_prefix('GHCRTS=-G7 '), extra_files(['T12870g.hs']), - omit_ways(['ghci'])], + omit_ways(['ghci','threaded2','profasm','profthreaded'])], multimod_compile_and_run, ['T12870g', '-rtsopts -with-rtsopts="-G3"']) test('T12870h', [extra_files(['T12870g.hs']), cmd_prefix('GHCRTS=-G7 '), extra_files(['T12870g.hs']), - omit_ways(['ghci'])], + omit_ways(['ghci','threaded2','profasm','profthreaded'])], multimod_compile_and_run, ['T12870g', '-rtsopts=ignoreAll -with-rtsopts="-G3"']) -- cgit v1.2.1