Sven Tennie pushed to branch wip/romes/hadrian-cross-stage2-rebase_SVEN_FIXED at Glasgow Haskell Compiler / GHC

Commits:

2 changed files:

Changes:

  • .gitlab/generate-ci/gen_ci.hs
    ... ... @@ -20,6 +20,7 @@ import qualified Data.ByteString.Lazy.Char8 as B
    20 20 
     import qualified Data.Set as S
    21 21 
     import System.Environment
    22 22 
     import Data.List
    23 
    +import Data.Char (isSpace)
    23 24
    24 25 
     {-
    25 26 
     Note [Generating the CI pipeline]
    ... ... @@ -885,14 +886,24 @@ job arch opsys buildConfig = NamedJob { name = jobName, jobInfo = Job {..} }
    885 886 
               Emulator s       -> "CROSS_EMULATOR" =: s
    886 887 
               NoEmulatorNeeded -> mempty
    887 888 
           , if withNuma buildConfig then "ENABLE_NUMA" =: "1" else mempty
    888 
    -      , let runtestArgs =
    889 
    +      , let testTimeoutArg =
    890 
    +                case crossEmulator buildConfig of
    891 
    +                  -- Emulators are naturally slower than native machines.
    892 
    +                  -- Triple the default of 300.
    893 
    +                  Emulator _ -> "--config=\"config.timeout=900\"" :: String
    894 
    +                  _ -> mempty
    895 
    +            runtestArgs =
    896 
    +                testTimeoutArg :
    889 897 
                     [ "--way=nonmoving --way=nonmoving_thr --way=nonmoving_thr_sanity"
    890 898 
                     | validateNonmovingGc buildConfig
    891 899 
                     ]
    892 
    -        in "RUNTEST_ARGS" =: unwords runtestArgs
    900 
    +        in "RUNTEST_ARGS" =: (trim . unwords) runtestArgs
    893 901 
           , if testsuiteUsePerf buildConfig then "RUNTEST_ARGS" =: "--config perf_path=perf" else mempty
    894 902 
           ]
    895 903
    904 
    +    trim :: String -> String
    905 
    +    trim = dropWhileEnd isSpace . dropWhile isSpace
    906 
    +
    896 907 
         jobArtifacts = Artifacts
    897 908 
           { junitReport = "junit.xml"
    898 909 
           , expireIn = "2 weeks"

  • .gitlab/jobs.yaml
    ... ... @@ -389,7 +389,7 @@
    389 389 
           "OBJCOPY": "/opt/llvm-mingw-linux/bin/aarch64-w64-mingw32-objcopy",
    390 390 
           "OBJDUMP": "/opt/llvm-mingw-linux/bin/aarch64-w64-mingw32-objdump",
    391 391 
           "RANLIB": "/opt/llvm-mingw-linux/bin/aarch64-w64-mingw32-llvm-ranlib",
    392 
    -      "RUNTEST_ARGS": "",
    392 
    +      "RUNTEST_ARGS": "--config=\"config.timeout=900\"",
    393 393 
           "SIZE": "/opt/llvm-mingw-linux/bin/aarch64-w64-mingw32-size",
    394 394 
           "STRINGS": "/opt/llvm-mingw-linux/bin/aarch64-w64-mingw32-strings",
    395 395 
           "STRIP": "/opt/llvm-mingw-linux/bin/aarch64-w64-mingw32-strip",
    ... ... @@ -471,7 +471,7 @@
    471 471 
           "OBJCOPY": "/opt/llvm-mingw-linux/bin/aarch64-w64-mingw32-objcopy",
    472 472 
           "OBJDUMP": "/opt/llvm-mingw-linux/bin/aarch64-w64-mingw32-objdump",
    473 473 
           "RANLIB": "/opt/llvm-mingw-linux/bin/aarch64-w64-mingw32-llvm-ranlib",
    474 
    -      "RUNTEST_ARGS": "",
    474 
    +      "RUNTEST_ARGS": "--config=\"config.timeout=900\"",
    475 475 
           "SIZE": "/opt/llvm-mingw-linux/bin/aarch64-w64-mingw32-size",
    476 476 
           "STRINGS": "/opt/llvm-mingw-linux/bin/aarch64-w64-mingw32-strings",
    477 477 
           "STRIP": "/opt/llvm-mingw-linux/bin/aarch64-w64-mingw32-strip",
    ... ... @@ -1060,7 +1060,7 @@
    1060 1060 
           "OBJCOPY": "/opt/llvm-mingw-linux/bin/aarch64-w64-mingw32-objcopy",
    1061 1061 
           "OBJDUMP": "/opt/llvm-mingw-linux/bin/aarch64-w64-mingw32-objdump",
    1062 1062 
           "RANLIB": "/opt/llvm-mingw-linux/bin/aarch64-w64-mingw32-llvm-ranlib",
    1063 
    -      "RUNTEST_ARGS": "",
    1063 
    +      "RUNTEST_ARGS": "--config=\"config.timeout=900\"",
    1064 1064 
           "SIZE": "/opt/llvm-mingw-linux/bin/aarch64-w64-mingw32-size",
    1065 1065 
           "STRINGS": "/opt/llvm-mingw-linux/bin/aarch64-w64-mingw32-strings",
    1066 1066 
           "STRIP": "/opt/llvm-mingw-linux/bin/aarch64-w64-mingw32-strip",
    ... ... @@ -1143,7 +1143,7 @@
    1143 1143 
           "OBJCOPY": "/opt/llvm-mingw-linux/bin/aarch64-w64-mingw32-objcopy",
    1144 1144 
           "OBJDUMP": "/opt/llvm-mingw-linux/bin/aarch64-w64-mingw32-objdump",
    1145 1145 
           "RANLIB": "/opt/llvm-mingw-linux/bin/aarch64-w64-mingw32-llvm-ranlib",
    1146 
    -      "RUNTEST_ARGS": "",
    1146 
    +      "RUNTEST_ARGS": "--config=\"config.timeout=900\"",
    1147 1147 
           "SIZE": "/opt/llvm-mingw-linux/bin/aarch64-w64-mingw32-size",
    1148 1148 
           "STRINGS": "/opt/llvm-mingw-linux/bin/aarch64-w64-mingw32-strings",
    1149 1149 
           "STRIP": "/opt/llvm-mingw-linux/bin/aarch64-w64-mingw32-strip",
    ... ... @@ -2055,7 +2055,7 @@
    2055 2055 
           "CROSS_STAGE": "2",
    2056 2056 
           "CROSS_TARGET": "aarch64-linux-gnu",
    2057 2057 
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    2058 
    -      "RUNTEST_ARGS": "",
    2058 
    +      "RUNTEST_ARGS": "--config=\"config.timeout=900\"",
    2059 2059 
           "TEST_ENV": "x86_64-linux-deb11-cross_aarch64-linux-gnu-validate",
    2060 2060 
           "XZ_OPT": "-9"
    2061 2061 
         }
    ... ... @@ -2122,7 +2122,7 @@
    2122 2122 
           "CROSS_STAGE": "2",
    2123 2123 
           "CROSS_TARGET": "javascript-unknown-ghcjs",
    2124 2124 
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    2125 
    -      "RUNTEST_ARGS": "",
    2125 
    +      "RUNTEST_ARGS": "--config=\"config.timeout=900\"",
    2126 2126 
           "TEST_ENV": "x86_64-linux-deb11-emsdk-closure-int_native-cross_javascript-unknown-ghcjs-validate",
    2127 2127 
           "XZ_OPT": "-9"
    2128 2128 
         }
    ... ... @@ -2504,7 +2504,7 @@
    2504 2504 
           "CROSS_STAGE": "2",
    2505 2505 
           "CROSS_TARGET": "riscv64-linux-gnu",
    2506 2506 
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    2507 
    -      "RUNTEST_ARGS": "",
    2507 
    +      "RUNTEST_ARGS": "--config=\"config.timeout=900\"",
    2508 2508 
           "TEST_ENV": "x86_64-linux-deb12-riscv-cross_riscv64-linux-gnu-validate",
    2509 2509 
           "XZ_OPT": "-9"
    2510 2510 
         }
    ... ... @@ -3518,7 +3518,7 @@
    3518 3518 
           "CROSS_STAGE": "2",
    3519 3519 
           "CROSS_TARGET": "loongarch64-linux-gnu",
    3520 3520 
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    3521 
    -      "RUNTEST_ARGS": "",
    3521 
    +      "RUNTEST_ARGS": "--config=\"config.timeout=900\"",
    3522 3522 
           "TEST_ENV": "x86_64-linux-ubuntu24_04-loongarch-cross_loongarch64-linux-gnu-validate",
    3523 3523 
           "XZ_OPT": "-9"
    3524 3524 
         }
    ... ... @@ -6165,7 +6165,7 @@
    6165 6165 
           "CROSS_STAGE": "2",
    6166 6166 
           "CROSS_TARGET": "aarch64-linux-gnu",
    6167 6167 
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    6168 
    -      "RUNTEST_ARGS": "",
    6168 
    +      "RUNTEST_ARGS": "--config=\"config.timeout=900\"",
    6169 6169 
           "TEST_ENV": "x86_64-linux-deb11-cross_aarch64-linux-gnu-validate"
    6170 6170 
         }
    6171 6171 
       },
    ... ... @@ -6231,7 +6231,7 @@
    6231 6231 
           "CROSS_STAGE": "2",
    6232 6232 
           "CROSS_TARGET": "javascript-unknown-ghcjs",
    6233 6233 
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    6234 
    -      "RUNTEST_ARGS": "",
    6234 
    +      "RUNTEST_ARGS": "--config=\"config.timeout=900\"",
    6235 6235 
           "TEST_ENV": "x86_64-linux-deb11-emsdk-closure-int_native-cross_javascript-unknown-ghcjs-validate"
    6236 6236 
         }
    6237 6237 
       },
    ... ... @@ -6608,7 +6608,7 @@
    6608 6608 
           "CROSS_STAGE": "2",
    6609 6609 
           "CROSS_TARGET": "riscv64-linux-gnu",
    6610 6610 
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    6611 
    -      "RUNTEST_ARGS": "",
    6611 
    +      "RUNTEST_ARGS": "--config=\"config.timeout=900\"",
    6612 6612 
           "TEST_ENV": "x86_64-linux-deb12-riscv-cross_riscv64-linux-gnu-validate"
    6613 6613 
         }
    6614 6614 
       },
    ... ... @@ -7607,7 +7607,7 @@
    7607 7607 
           "CROSS_STAGE": "2",
    7608 7608 
           "CROSS_TARGET": "loongarch64-linux-gnu",
    7609 7609 
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    7610 
    -      "RUNTEST_ARGS": "",
    7610 
    +      "RUNTEST_ARGS": "--config=\"config.timeout=900\"",
    7611 7611 
           "TEST_ENV": "x86_64-linux-ubuntu24_04-loongarch-cross_loongarch64-linux-gnu-validate"
    7612 7612 
         }
    7613 7613 
       },

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications · Help