[commit: ghc] master: Fix some of the failures in sanity way (a610c21)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/a610c215580c56116b0882d3dce4a3a45993df19/ghc

>---------------------------------------------------------------

commit a610c215580c56116b0882d3dce4a3a45993df19
Author: Ömer Sinan Ağacan <omeragacan at gmail.com>
Date:   Wed Jun 13 15:29:11 2018 +0300

    Fix some of the failures in sanity way
    
    Tests for runtime argument parsing should only run in normal way to
    avoid breakage caused by way-specific RTS arguments.
    
    Reviewers: bgamari, AndreasK, simonmar
    
    Reviewed By: bgamari
    
    Subscribers: rwbarton, thomie, carter
    
    GHC Trac Issues: #15241
    
    Differential Revision: https://phabricator.haskell.org/D4839


>---------------------------------------------------------------

a610c215580c56116b0882d3dce4a3a45993df19
 testsuite/tests/rts/flags/all.T | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/testsuite/tests/rts/flags/all.T b/testsuite/tests/rts/flags/all.T
index 6bfa14f..6d9368e 100644
--- a/testsuite/tests/rts/flags/all.T
+++ b/testsuite/tests/rts/flags/all.T
@@ -1,53 +1,53 @@
-#We ignore ways which depend on passing RTS arguments for simplicity. 
+# We ignore ways which depend on passing RTS arguments for simplicity and only
+# run in normal way.
 
-#Standard handling of RTS arguments
+# Standard handling of RTS arguments
 test('T12870a',
     [extra_run_opts('+RTS -G2 -RTS arg1 --RTS +RTS arg2'), extra_files(['T12870.hs']),
-        omit_ways(['ghci','threaded2','profasm','profthreaded'])],
+        only_ways(['normal'])],
     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','threaded2','profasm','profthreaded'])],
+        exit_code(1), ignore_stderr, only_ways(['normal'])],
     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','threaded2','profasm','profthreaded'])],
+        exit_code(1), only_ways(['normal'])],
     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','threaded2','profasm','profthreaded'])],
+        only_ways(['normal'])],
     multimod_compile_and_run,
     ['T12870', ''])
 
-#RTS options should be passed along to the program
+# 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','profasm','profthreaded'])],
+        only_ways(['normal'])],
     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','profasm','profthreaded'])],
+        only_ways(['normal'])],
     multimod_compile_and_run,
     ['T12870', '-rtsopts=ignoreAll'])
 
-#Check handling of env variables
+# Check handling of env variables
 test('T12870g',
     [extra_files(['T12870g.hs']), cmd_prefix('GHCRTS=-G7 '), extra_files(['T12870g.hs']),
-        omit_ways(['ghci','threaded2','profasm','profthreaded'])],
+        only_ways(['normal'])],
     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','threaded2','profasm','profthreaded'])],
+        only_ways(['normal'])],
     multimod_compile_and_run,
     ['T12870g', '-rtsopts=ignoreAll -with-rtsopts="-G3"'])
-