[commit: ghc] master: hadrian/test: Don't depend upon iserv on Windows (cbf57b7)

[git at git.haskell.org]

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

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

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

commit cbf57b7dbfdbfa72475d793b27858cacf2ed9816
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Mon Nov 26 11:08:39 2018 -0500

    hadrian/test: Don't depend upon iserv on Windows
    
    Iserv is not supported on Windows. This fixes #15950 but this whole situation
    feels awfully fragile to me.


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

cbf57b7dbfdbfa72475d793b27858cacf2ed9816
 hadrian/src/Rules/Test.hs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/hadrian/src/Rules/Test.hs b/hadrian/src/Rules/Test.hs
index bbce4db..d6ac7eb 100644
--- a/hadrian/src/Rules/Test.hs
+++ b/hadrian/src/Rules/Test.hs
@@ -81,7 +81,9 @@ testRules = do
 needTestsuitePackages :: Action ()
 needTestsuitePackages = do
     targets   <- mapM (needFile Stage1) =<< testsuitePackages
-    needIservBins
+    -- iserv is not supported under Windows
+    windows <- windowsHost
+    when (not windows) needIservBins
     need targets
 
 -- | Build the timeout program.