diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2022-10-18 14:22:40 -0400 |
|---|---|---|
| committer | Cheng Shao <terrorjack@type.dance> | 2023-03-30 18:43:53 +0000 |
| commit | ee160d067fe319d73f64c8131c11873d6e065152 (patch) | |
| tree | f2be28f605834c92ebc467fd29bd02c0a124525c | |
| parent | e7392b4ecb39166328e60358e302108b6a9339b9 (diff) | |
| download | haskell-ee160d067fe319d73f64c8131c11873d6e065152.tar.gz | |
hadrian: Pass CROSS_EMULATOR to runtests.py
| -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 a0a245458b..60de539a12 100644 --- a/hadrian/src/Settings/Builders/RunTest.hs +++ b/hadrian/src/Settings/Builders/RunTest.hs @@ -213,6 +213,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 @@ -282,6 +283,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. |