[Git][ghc/ghc][wip/js-staging] hadrian: fix js and native testing

[doyougnu (@doyougnu)]

doyougnu pushed to branch wip/js-staging at Glasgow Haskell Compiler / GHC


Commits:
722f2b0b by doyougnu at 2022-10-22T08:15:14-04:00
hadrian: fix js and native testing

- - - - -


1 changed file:

- hadrian/src/Rules/Test.hs


Changes:

=====================================
hadrian/src/Rules/Test.hs
=====================================
@@ -193,6 +193,11 @@ testRules = do
         need [root -/- timeoutPath]
 
         cross <- flag CrossCompiling
+        isJs  <- isJsTarget
+
+        let stage2 s
+             | Stage2 {} <- s = True
+             | otherwise      = False
 
         -- get absolute path for the given program in the given stage
         let absolute_path_stage s p = do
@@ -202,8 +207,8 @@ testRules = do
 
         -- get absolute path for the given program in the target stage
         let absolute_path
-              | Stage0 {} <- stg = absolute_path_stage stg
-              | otherwise        = absolute_path_stage $ predStage stg
+              | isJs && stage2 stg = absolute_path_stage (predStage stg)
+              | otherwise          = absolute_path_stage stg
 
         -- get absolute path for the given program in stage1 (useful for
         -- cross-compilers)



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/722f2b0bd380bf6601e82968b4a4dc245221832c

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/722f2b0bd380bf6601e82968b4a4dc245221832c
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20221022/2218da4d/attachment-0001.html>