[commit: ghc] master: hadrian: make it possible to run the testsuite with quickest and quick (cc615c6)

[git at git.haskell.org]

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

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

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

commit cc615c697b54e3141e7b30b975de0b07dc9b8b29
Author: Alp Mestanogullari <alp at well-typed.com>
Date:   Mon Nov 19 16:12:56 2018 +0100

    hadrian: make it possible to run the testsuite with quickest and quick
    
    More generally, we so far assumed that the testsuite would be executed
    with a flavour that's as comprehensive as perf in terms of available RTS
    and library flavours (at least vanilla + dynamic + prof). This would
    manifest itself concretely by needing 3 "ways" of the iserv program,
    unconditionally.
    
    We now only require the ways among vanilla, dynamic and prof that we
    can find in our current Flavour's rtsWays.
    
    Test Plan:
    hadrian/build.sh --flavour={quick, quickest} test now goes through
    (with a few failing tests, of course).
    
    Reviewers: bgamari, tdammers
    
    Reviewed By: tdammers
    
    Subscribers: mpickering, RyanGlScott, rwbarton, carter
    
    Differential Revision: https://phabricator.haskell.org/D5355


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

cc615c697b54e3141e7b30b975de0b07dc9b8b29
 hadrian/src/Rules/Test.hs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/hadrian/src/Rules/Test.hs b/hadrian/src/Rules/Test.hs
index de73390..bbce4db 100644
--- a/hadrian/src/Rules/Test.hs
+++ b/hadrian/src/Rules/Test.hs
@@ -104,9 +104,13 @@ timeoutProgBuilder = do
             makeExecutable (root -/- timeoutPath)
 
 needIservBins :: Action ()
-needIservBins =
+needIservBins = do
+    rtsways <- interpretInContext (vanillaContext Stage1 ghc) getRtsWays
     need =<< traverse programPath
-      [ Context Stage1 iserv w | w <- [vanilla, profiling, dynamic] ]
+               [ Context Stage1 iserv w
+               | w <- [vanilla, profiling, dynamic]
+               , w `elem` rtsways
+               ]
 
 needTestBuilders :: Action ()
 needTestBuilders = do