diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2022-10-18 14:22:40 -0400 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2022-10-18 16:23:55 -0400 |
| commit | 0a03d9d23abdb4399569f8804083e54e5d77b44a (patch) | |
| tree | d573f02a7059238ff6f5206fbfcf9b1c835d5f71 | |
| parent | fab09f4b3127f2120d8d61158d2c176613829eca (diff) | |
| download | haskell-wip/cross-ci.tar.gz | |
hadrian: Pass CROSS_EMULATOR to runtests.pywip/cross-ci
| -rw-r--r-- | hadrian/src/Settings/Builders/RunTest.hs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/hadrian/src/Settings/Builders/RunTest.hs b/hadrian/src/Settings/Builders/RunTest.hs index 40bc5f2ac6..f684af2d47 100644 --- a/hadrian/src/Settings/Builders/RunTest.hs +++ b/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 "CROSS_EMULATOR" 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. |