Sven Tennie pushed to branch wip/romes/hadrian-cross-stage2-rebase_SVEN_FINAL at Glasgow Haskell Compiler / GHC Commits: 94fb90c7 by Matthew Pickering at 2025-12-30T10:36:31+01:00 ci: Javascript don't set CROSS_EMULATOR There is no CROSS_EMULATOR needed to run javascript binaries, so we don't set the CROSS_EMULATOR to some dummy value. We want to keep the increased timeout settings, though. Co-authored-by: Sven Tennie <sven.tennie@gmail.com> - - - - - 2 changed files: - .gitlab/generate-ci/gen_ci.hs - .gitlab/jobs.yaml Changes: ===================================== .gitlab/generate-ci/gen_ci.hs ===================================== @@ -139,9 +139,11 @@ bignumString :: BignumBackend -> String bignumString Gmp = "gmp" bignumString Native = "native" +data TimeoutIncrease = TimeoutIncrease | NoTimeoutIncrease + data CrossEmulator = NoEmulator - | NoEmulatorNeeded + | NoEmulatorNeeded TimeoutIncrease | Emulator String -- | A BuildConfig records all the options which can be modified to affect the @@ -889,16 +891,19 @@ job arch opsys buildConfig = NamedJob { name = jobName, jobInfo = Job {..} } NoEmulator -- we need an emulator but it isn't set. Won't run the testsuite | Just _ <- crossTarget buildConfig - -> "CROSS_EMULATOR" =: "NOT_SET" - | otherwise -> mempty - Emulator s -> "CROSS_EMULATOR" =: s - NoEmulatorNeeded -> mempty + -> "CROSS_EMULATOR" =: "NOT_SET" + | otherwise -> mempty + Emulator s -> "CROSS_EMULATOR" =: s + NoEmulatorNeeded _ -> mempty , if withNuma buildConfig then "ENABLE_NUMA" =: "1" else mempty - , let testTimeoutArg = + , let timeoutConf = "-e config.timeout=900" + testTimeoutArg = case crossEmulator buildConfig of -- Emulators are naturally slower than native machines. -- Triple the default of 300. - Emulator _ -> "-e config.timeout=900" :: String + Emulator _ -> timeoutConf + -- NodeJS and WASM are slower than native code + NoEmulatorNeeded TimeoutIncrease -> timeoutConf _ -> mempty runtestArgs = testTimeoutArg : @@ -1308,7 +1313,7 @@ cross_jobs = [ (validateBuilds AArch64 (Linux Debian12Wine) (winAarch64Config {llvmBootstrap = True})) ] where - javascriptConfig = (crossConfig "javascript-unknown-ghcjs" NoEmulatorNeeded (Just "emconfigure")) + javascriptConfig = (crossConfig "javascript-unknown-ghcjs" (NoEmulatorNeeded TimeoutIncrease) (Just "emconfigure")) { bignumBackend = Native } makeWinArmJobs = modifyJobs @@ -1353,7 +1358,7 @@ cross_jobs = [ $ addValidateRule WasmBackend $ validateBuilds Amd64 (Linux AlpineWasm) cfg wasm_build_config = - (crossConfig "wasm32-wasi" NoEmulatorNeeded Nothing) + (crossConfig "wasm32-wasi" (NoEmulatorNeeded NoTimeoutIncrease) Nothing) { hostFullyStatic = True , buildFlavour = Release -- TODO: This needs to be validate but wasm backend doesn't pass yet , textWithSIMDUTF = True ===================================== .gitlab/jobs.yaml ===================================== @@ -2121,7 +2121,7 @@ "CROSS_STAGE": "2", "CROSS_TARGET": "javascript-unknown-ghcjs", "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check", - "RUNTEST_ARGS": "", + "RUNTEST_ARGS": "-e config.timeout=900", "TEST_ENV": "x86_64-linux-deb11-emsdk-closure-int_native-cross_javascript-unknown-ghcjs-validate", "XZ_OPT": "-9" } @@ -6294,7 +6294,7 @@ "CROSS_STAGE": "2", "CROSS_TARGET": "javascript-unknown-ghcjs", "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check", - "RUNTEST_ARGS": "", + "RUNTEST_ARGS": "-e config.timeout=900", "TEST_ENV": "x86_64-linux-deb11-emsdk-closure-int_native-cross_javascript-unknown-ghcjs-validate" } }, View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/94fb90c7b5d4c81389a5ac3c7a5e7b99... -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/94fb90c7b5d4c81389a5ac3c7a5e7b99... You're receiving this email because of your account on gitlab.haskell.org.