[Git][ghc/ghc][wip/cross-ci] hadrian: Introduce TARGET_WRAPPER env var

Ben Gamari (@bgamari) gitlab at gitlab.haskell.org
Tue Oct 18 18:22:56 UTC 2022



Ben Gamari pushed to branch wip/cross-ci at Glasgow Haskell Compiler / GHC


Commits:
0c43c5b7 by Ben Gamari at 2022-10-18T14:22:40-04:00
hadrian: Introduce TARGET_WRAPPER env var

- - - - -


1 changed file:

- hadrian/src/Settings/Builders/RunTest.hs


Changes:

=====================================
hadrian/src/Settings/Builders/RunTest.hs
=====================================
@@ -209,6 +209,7 @@ runTestBuilderArgs = builder Testsuite ? do
     (testEnv, testMetricsFile) <- expr . liftIO $
         (,) <$> lookupEnv "TEST_ENV" <*> lookupEnv "METRICS_FILE"
     perfBaseline <- expr . liftIO $ lookupEnv "PERF_BASELINE_COMMIT"
+    targetWrapper <- expr . liftIO $ lookupEnv "TARGET_WRAPPER"
 
     threads     <- shakeThreads <$> expr getShakeOptions
     top         <- expr $ topDirectory
@@ -277,6 +278,7 @@ runTestBuilderArgs = builder Testsuite ? do
             , case perfBaseline of
                 Just commit | not (null commit) -> arg ("--perf-baseline=" ++ commit)
                 _ -> mempty
+            , emitWhenSet targetWrapper $ \cmd -> arg ("--target-wrapper=" ++ cmd)
             , emitWhenSet testEnv $ \env -> arg ("--test-env=" ++ env)
             , emitWhenSet testMetricsFile $ \file -> arg ("--metrics-file=" ++ file)
             , getTestArgs -- User-provided arguments from command line.



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/0c43c5b7e4ba56f8af4900b50b31ab54df3ee1d8

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/0c43c5b7e4ba56f8af4900b50b31ab54df3ee1d8
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/20221018/9920da0b/attachment-0001.html>


More information about the ghc-commits mailing list