Florian Ragwitz pushed to branch wip/rafl/hpc-tixdir at Glasgow Haskell Compiler / GHC

Commits:

2 changed files:

Changes:

  • .gitlab/generate-ci/gen_ci.hs
    ... ... @@ -1003,7 +1003,7 @@ validate arch opsys bc =
    1003 1003
           covered = ignorePerfFailures
    
    1004 1004
                   $ setVariable "RUNTEST_ARGS"
    
    1005 1005
                       (unwords $ fromMaybe [] (mmlookup "RUNTEST_ARGS" (jobVariables j))
    
    1006
    -                           ++ ["-e config.timeout+=config.timeout+config.timeout"])
    
    1006
    +                           ++ ["-e config.timeout+=config.timeout+config.timeout+config.timeout+config.timeout"])
    
    1007 1007
                   $ setVariable "BUILD_FLAVOUR"
    
    1008 1008
                       (flavourString (mkJobFlavour bc) ++ "+coverage") j
    
    1009 1009
           saveCoverage = (if opsys == Windows then "bash " else "")
    

  • .gitlab/jobs.yaml
    ... ... @@ -65,7 +65,7 @@
    65 65
           "LANG": "en_US.UTF-8",
    
    66 66
           "MACOSX_DEPLOYMENT_TARGET": "11.0",
    
    67 67
           "NIX_SYSTEM": "aarch64-darwin",
    
    68
    -      "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout",
    
    68
    +      "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout+config.timeout+config.timeout",
    
    69 69
           "TEST_ENV": "aarch64-darwin-validate",
    
    70 70
           "TEST_WAYS": ""
    
    71 71
         }
    
    ... ... @@ -132,7 +132,7 @@
    132 132
           "CONFIGURE_ARGS": "--disable-ld-override --enable-ignore-build-platform-mismatch --build=aarch64-unknown-linux --host=aarch64-unknown-linux --target=aarch64-unknown-linux --enable-strict-ghc-toolchain-check",
    
    133 133
           "IGNORE_PERF_FAILURES": "all",
    
    134 134
           "INSTALL_CONFIGURE_ARGS": "--disable-ld-override --enable-strict-ghc-toolchain-check",
    
    135
    -      "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout",
    
    135
    +      "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout+config.timeout+config.timeout",
    
    136 136
           "TEST_ENV": "aarch64-linux-alpine3_23-validate",
    
    137 137
           "TEST_WAYS": ""
    
    138 138
         }
    
    ... ... @@ -198,7 +198,7 @@
    198 198
           "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    199 199
           "IGNORE_PERF_FAILURES": "all",
    
    200 200
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    201
    -      "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout",
    
    201
    +      "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout+config.timeout+config.timeout",
    
    202 202
           "TEST_ENV": "aarch64-linux-deb11-validate",
    
    203 203
           "TEST_WAYS": ""
    
    204 204
         }
    
    ... ... @@ -264,7 +264,7 @@
    264 264
           "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    265 265
           "IGNORE_PERF_FAILURES": "all",
    
    266 266
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    267
    -      "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout",
    
    267
    +      "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout+config.timeout+config.timeout",
    
    268 268
           "TEST_ENV": "aarch64-linux-deb12-validate",
    
    269 269
           "TEST_WAYS": ""
    
    270 270
         }
    
    ... ... @@ -346,7 +346,7 @@
    346 346
           "OBJCOPY": "/opt/llvm-mingw-linux/bin/aarch64-w64-mingw32-objcopy",
    
    347 347
           "OBJDUMP": "/opt/llvm-mingw-linux/bin/aarch64-w64-mingw32-objdump",
    
    348 348
           "RANLIB": "/opt/llvm-mingw-linux/bin/aarch64-w64-mingw32-llvm-ranlib",
    
    349
    -      "RUNTEST_ARGS": "-e config.timeout=900 -e config.timeout+=config.timeout+config.timeout",
    
    349
    +      "RUNTEST_ARGS": "-e config.timeout=900 -e config.timeout+=config.timeout+config.timeout+config.timeout+config.timeout",
    
    350 350
           "SIZE": "/opt/llvm-mingw-linux/bin/aarch64-w64-mingw32-size",
    
    351 351
           "STRINGS": "/opt/llvm-mingw-linux/bin/aarch64-w64-mingw32-strings",
    
    352 352
           "STRIP": "/opt/llvm-mingw-linux/bin/aarch64-w64-mingw32-strip",
    
    ... ... @@ -433,7 +433,7 @@
    433 433
           "OBJCOPY": "/opt/llvm-mingw-linux/bin/aarch64-w64-mingw32-objcopy",
    
    434 434
           "OBJDUMP": "/opt/llvm-mingw-linux/bin/aarch64-w64-mingw32-objdump",
    
    435 435
           "RANLIB": "/opt/llvm-mingw-linux/bin/aarch64-w64-mingw32-llvm-ranlib",
    
    436
    -      "RUNTEST_ARGS": "-e config.timeout=900 -e config.timeout+=config.timeout+config.timeout",
    
    436
    +      "RUNTEST_ARGS": "-e config.timeout=900 -e config.timeout+=config.timeout+config.timeout+config.timeout+config.timeout",
    
    437 437
           "SIZE": "/opt/llvm-mingw-linux/bin/aarch64-w64-mingw32-size",
    
    438 438
           "STRINGS": "/opt/llvm-mingw-linux/bin/aarch64-w64-mingw32-strings",
    
    439 439
           "STRIP": "/opt/llvm-mingw-linux/bin/aarch64-w64-mingw32-strip",
    
    ... ... @@ -504,7 +504,7 @@
    504 504
           "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    505 505
           "IGNORE_PERF_FAILURES": "all",
    
    506 506
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    507
    -      "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout",
    
    507
    +      "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout+config.timeout+config.timeout",
    
    508 508
           "TEST_ENV": "aarch64-linux-deb13-validate",
    
    509 509
           "TEST_WAYS": ""
    
    510 510
         }
    
    ... ... @@ -570,7 +570,7 @@
    570 570
           "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    571 571
           "IGNORE_PERF_FAILURES": "all",
    
    572 572
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    573
    -      "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout",
    
    573
    +      "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout+config.timeout+config.timeout",
    
    574 574
           "TEST_ENV": "aarch64-linux-deb13-validate+llvm",
    
    575 575
           "TEST_WAYS": "llvm optllvm"
    
    576 576
         }
    
    ... ... @@ -637,7 +637,7 @@
    637 637
           "CONFIGURE_ARGS": "--disable-ld-override --enable-strict-ghc-toolchain-check",
    
    638 638
           "IGNORE_PERF_FAILURES": "all",
    
    639 639
           "INSTALL_CONFIGURE_ARGS": "--disable-ld-override --enable-strict-ghc-toolchain-check",
    
    640
    -      "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout",
    
    640
    +      "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout+config.timeout+config.timeout",
    
    641 641
           "TEST_ENV": "i386-linux-alpine3_23-validate",
    
    642 642
           "TEST_WAYS": ""
    
    643 643
         }
    
    ... ... @@ -703,7 +703,7 @@
    703 703
           "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    704 704
           "IGNORE_PERF_FAILURES": "all",
    
    705 705
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    706
    -      "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout",
    
    706
    +      "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout+config.timeout+config.timeout",
    
    707 707
           "TEST_ENV": "i386-linux-deb11-validate",
    
    708 708
           "TEST_WAYS": ""
    
    709 709
         }
    
    ... ... @@ -769,7 +769,7 @@
    769 769
           "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    770 770
           "IGNORE_PERF_FAILURES": "all",
    
    771 771
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    772
    -      "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout",
    
    772
    +      "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout+config.timeout+config.timeout",
    
    773 773
           "TEST_ENV": "i386-linux-deb12-validate",
    
    774 774
           "TEST_WAYS": ""
    
    775 775
         }
    
    ... ... @@ -835,7 +835,7 @@
    835 835
           "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    836 836
           "IGNORE_PERF_FAILURES": "all",
    
    837 837
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    838
    -      "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout",
    
    838
    +      "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout+config.timeout+config.timeout",
    
    839 839
           "TEST_ENV": "i386-linux-deb13-validate",
    
    840 840
           "TEST_WAYS": ""
    
    841 841
         }
    
    ... ... @@ -5711,7 +5711,7 @@
    5711 5711
           "LANG": "en_US.UTF-8",
    
    5712 5712
           "MACOSX_DEPLOYMENT_TARGET": "11.0",
    
    5713 5713
           "NIX_SYSTEM": "x86_64-darwin",
    
    5714
    -      "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout",
    
    5714
    +      "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout+config.timeout+config.timeout",
    
    5715 5715
           "TEST_ENV": "x86_64-darwin-validate",
    
    5716 5716
           "TEST_WAYS": "",
    
    5717 5717
           "ac_cv_func_clock_gettime": "no",
    
    ... ... @@ -5783,7 +5783,7 @@
    5783 5783
           "FETCH_GHC_VERSION": "9.10.3",
    
    5784 5784
           "IGNORE_PERF_FAILURES": "all",
    
    5785 5785
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    5786
    -      "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout",
    
    5786
    +      "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout+config.timeout+config.timeout",
    
    5787 5787
           "TEST_ENV": "x86_64-freebsd14-validate",
    
    5788 5788
           "TEST_WAYS": ""
    
    5789 5789
         }
    
    ... ... @@ -5850,7 +5850,7 @@
    5850 5850
           "CONFIGURE_ARGS": "--disable-ld-override --enable-strict-ghc-toolchain-check",
    
    5851 5851
           "IGNORE_PERF_FAILURES": "all",
    
    5852 5852
           "INSTALL_CONFIGURE_ARGS": "--disable-ld-override --enable-strict-ghc-toolchain-check",
    
    5853
    -      "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout",
    
    5853
    +      "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout+config.timeout+config.timeout",
    
    5854 5854
           "TEST_ENV": "x86_64-linux-alpine3_12-int_native-validate+fully_static",
    
    5855 5855
           "TEST_WAYS": ""
    
    5856 5856
         }
    
    ... ... @@ -5917,7 +5917,7 @@
    5917 5917
           "CONFIGURE_ARGS": "--disable-ld-override --enable-strict-ghc-toolchain-check",
    
    5918 5918
           "IGNORE_PERF_FAILURES": "all",
    
    5919 5919
           "INSTALL_CONFIGURE_ARGS": "--disable-ld-override --enable-strict-ghc-toolchain-check",
    
    5920
    -      "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout",
    
    5920
    +      "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout+config.timeout+config.timeout",
    
    5921 5921
           "TEST_ENV": "x86_64-linux-alpine3_12-validate+fully_static",
    
    5922 5922
           "TEST_WAYS": ""
    
    5923 5923
         }
    
    ... ... @@ -5984,7 +5984,7 @@
    5984 5984
           "CONFIGURE_ARGS": "--disable-ld-override --enable-strict-ghc-toolchain-check",
    
    5985 5985
           "IGNORE_PERF_FAILURES": "all",
    
    5986 5986
           "INSTALL_CONFIGURE_ARGS": "--disable-ld-override --enable-strict-ghc-toolchain-check",
    
    5987
    -      "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout",
    
    5987
    +      "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout+config.timeout+config.timeout",
    
    5988 5988
           "TEST_ENV": "x86_64-linux-alpine3_23-validate",
    
    5989 5989
           "TEST_WAYS": ""
    
    5990 5990
         }
    
    ... ... @@ -6053,7 +6053,7 @@
    6053 6053
           "FIREFOX_LAUNCH_OPTS": "{\"browser\":\"firefox\",\"executablePath\":\"/usr/bin/firefox\"}",
    
    6054 6054
           "HADRIAN_ARGS": "--docs=no-sphinx-pdfs --docs=no-sphinx-man",
    
    6055 6055
           "IGNORE_PERF_FAILURES": "all",
    
    6056
    -      "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout",
    
    6056
    +      "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout+config.timeout+config.timeout",
    
    6057 6057
           "TEST_ENV": "x86_64-linux-alpine3_23-wasm-cross_wasm32-wasi-release+host_fully_static+text_simdutf",
    
    6058 6058
           "TEST_WAYS": ""
    
    6059 6059
         }
    
    ... ... @@ -6123,7 +6123,7 @@
    6123 6123
           "FIREFOX_LAUNCH_OPTS": "{\"browser\":\"firefox\",\"executablePath\":\"/usr/bin/firefox\"}",
    
    6124 6124
           "HADRIAN_ARGS": "--docs=no-sphinx-pdfs --docs=no-sphinx-man",
    
    6125 6125
           "IGNORE_PERF_FAILURES": "all",
    
    6126
    -      "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout",
    
    6126
    +      "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout+config.timeout+config.timeout",
    
    6127 6127
           "TEST_ENV": "x86_64-linux-alpine3_23-wasm-int_native-cross_wasm32-wasi-release+host_fully_static+text_simdutf",
    
    6128 6128
           "TEST_WAYS": ""
    
    6129 6129
         }
    
    ... ... @@ -6193,7 +6193,7 @@
    6193 6193
           "FIREFOX_LAUNCH_OPTS": "{\"browser\":\"firefox\",\"executablePath\":\"/usr/bin/firefox\"}",
    
    6194 6194
           "HADRIAN_ARGS": "--docs=no-sphinx-pdfs --docs=no-sphinx-man",
    
    6195 6195
           "IGNORE_PERF_FAILURES": "all",
    
    6196
    -      "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout",
    
    6196
    +      "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout+config.timeout+config.timeout",
    
    6197 6197
           "TEST_ENV": "x86_64-linux-alpine3_23-wasm-unreg-cross_wasm32-wasi-release+host_fully_static+text_simdutf",
    
    6198 6198
           "TEST_WAYS": ""
    
    6199 6199
         }
    
    ... ... @@ -6262,7 +6262,7 @@
    6262 6262
           "CROSS_TARGET": "javascript-unknown-ghcjs",
    
    6263 6263
           "IGNORE_PERF_FAILURES": "all",
    
    6264 6264
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    6265
    -      "RUNTEST_ARGS": "-e config.timeout=900 -e config.timeout+=config.timeout+config.timeout",
    
    6265
    +      "RUNTEST_ARGS": "-e config.timeout=900 -e config.timeout+=config.timeout+config.timeout+config.timeout+config.timeout",
    
    6266 6266
           "TEST_ENV": "x86_64-linux-deb11-emsdk-closure-int_native-cross_javascript-unknown-ghcjs-validate",
    
    6267 6267
           "TEST_WAYS": ""
    
    6268 6268
         }
    
    ... ... @@ -6328,7 +6328,7 @@
    6328 6328
           "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    6329 6329
           "IGNORE_PERF_FAILURES": "all",
    
    6330 6330
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    6331
    -      "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout",
    
    6331
    +      "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout+config.timeout+config.timeout",
    
    6332 6332
           "TEST_ENV": "x86_64-linux-deb11-validate",
    
    6333 6333
           "TEST_WAYS": ""
    
    6334 6334
         }
    
    ... ... @@ -6394,7 +6394,7 @@
    6394 6394
           "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    6395 6395
           "IGNORE_PERF_FAILURES": "all",
    
    6396 6396
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    6397
    -      "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout",
    
    6397
    +      "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout+config.timeout+config.timeout",
    
    6398 6398
           "TEST_ENV": "x86_64-linux-deb11-validate+debug_info",
    
    6399 6399
           "TEST_WAYS": ""
    
    6400 6400
         }
    
    ... ... @@ -6460,7 +6460,7 @@
    6460 6460
           "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    6461 6461
           "IGNORE_PERF_FAILURES": "all",
    
    6462 6462
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    6463
    -      "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout",
    
    6463
    +      "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout+config.timeout+config.timeout",
    
    6464 6464
           "TEST_ENV": "x86_64-linux-deb12-validate",
    
    6465 6465
           "TEST_WAYS": ""
    
    6466 6466
         }
    
    ... ... @@ -6529,7 +6529,7 @@
    6529 6529
           "CROSS_TARGET": "aarch64-linux-gnu",
    
    6530 6530
           "IGNORE_PERF_FAILURES": "all",
    
    6531 6531
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    6532
    -      "RUNTEST_ARGS": "-e config.timeout=900 -e config.timeout+=config.timeout+config.timeout",
    
    6532
    +      "RUNTEST_ARGS": "-e config.timeout=900 -e config.timeout+=config.timeout+config.timeout+config.timeout+config.timeout",
    
    6533 6533
           "TEST_ENV": "x86_64-linux-deb13-cross_aarch64-linux-gnu-validate",
    
    6534 6534
           "TEST_WAYS": ""
    
    6535 6535
         }
    
    ... ... @@ -6595,7 +6595,7 @@
    6595 6595
           "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    6596 6596
           "IGNORE_PERF_FAILURES": "all",
    
    6597 6597
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    6598
    -      "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout",
    
    6598
    +      "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout+config.timeout+config.timeout",
    
    6599 6599
           "TEST_ENV": "x86_64-linux-deb13-int_native-validate",
    
    6600 6600
           "TEST_WAYS": ""
    
    6601 6601
         }
    
    ... ... @@ -6662,7 +6662,7 @@
    6662 6662
           "CONFIGURE_ARGS": "--disable-tables-next-to-code --enable-strict-ghc-toolchain-check",
    
    6663 6663
           "IGNORE_PERF_FAILURES": "all",
    
    6664 6664
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    6665
    -      "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout",
    
    6665
    +      "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout+config.timeout+config.timeout",
    
    6666 6666
           "TEST_ENV": "x86_64-linux-deb13-no_tntc-validate",
    
    6667 6667
           "TEST_WAYS": ""
    
    6668 6668
         }
    
    ... ... @@ -6729,7 +6729,7 @@
    6729 6729
           "ENABLE_NUMA": "1",
    
    6730 6730
           "IGNORE_PERF_FAILURES": "all",
    
    6731 6731
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    6732
    -      "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout",
    
    6732
    +      "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout+config.timeout+config.timeout",
    
    6733 6733
           "TEST_ENV": "x86_64-linux-deb13-numa-slow-validate",
    
    6734 6734
           "TEST_WAYS": ""
    
    6735 6735
         }
    
    ... ... @@ -6795,7 +6795,7 @@
    6795 6795
           "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    6796 6796
           "IGNORE_PERF_FAILURES": "all",
    
    6797 6797
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    6798
    -      "RUNTEST_ARGS": " --config perf_path=perf -e config.timeout+=config.timeout+config.timeout",
    
    6798
    +      "RUNTEST_ARGS": " --config perf_path=perf -e config.timeout+=config.timeout+config.timeout+config.timeout+config.timeout",
    
    6799 6799
           "TEST_ENV": "x86_64-linux-deb13-release",
    
    6800 6800
           "TEST_WAYS": ""
    
    6801 6801
         }
    
    ... ... @@ -6864,7 +6864,7 @@
    6864 6864
           "CROSS_TARGET": "riscv64-linux-gnu",
    
    6865 6865
           "IGNORE_PERF_FAILURES": "all",
    
    6866 6866
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    6867
    -      "RUNTEST_ARGS": "-e config.timeout=900 -e config.timeout+=config.timeout+config.timeout",
    
    6867
    +      "RUNTEST_ARGS": "-e config.timeout=900 -e config.timeout+=config.timeout+config.timeout+config.timeout+config.timeout",
    
    6868 6868
           "TEST_ENV": "x86_64-linux-deb13-riscv-cross_riscv64-linux-gnu-validate",
    
    6869 6869
           "TEST_WAYS": ""
    
    6870 6870
         }
    
    ... ... @@ -6930,7 +6930,7 @@
    6930 6930
           "CONFIGURE_ARGS": "--enable-unregisterised --enable-strict-ghc-toolchain-check",
    
    6931 6931
           "IGNORE_PERF_FAILURES": "all",
    
    6932 6932
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    6933
    -      "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout",
    
    6933
    +      "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout+config.timeout+config.timeout",
    
    6934 6934
           "TEST_ENV": "x86_64-linux-deb13-unreg-validate",
    
    6935 6935
           "TEST_WAYS": ""
    
    6936 6936
         }
    
    ... ... @@ -6996,7 +6996,7 @@
    6996 6996
           "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    6997 6997
           "IGNORE_PERF_FAILURES": "all",
    
    6998 6998
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    6999
    -      "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout",
    
    6999
    +      "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout+config.timeout+config.timeout",
    
    7000 7000
           "TEST_ENV": "x86_64-linux-deb13-validate",
    
    7001 7001
           "TEST_WAYS": ""
    
    7002 7002
         }
    
    ... ... @@ -7062,7 +7062,7 @@
    7062 7062
           "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    7063 7063
           "IGNORE_PERF_FAILURES": "all",
    
    7064 7064
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    7065
    -      "RUNTEST_ARGS": "--way=nonmoving --way=nonmoving_thr --way=nonmoving_thr_sanity -e config.timeout+=config.timeout+config.timeout",
    
    7065
    +      "RUNTEST_ARGS": "--way=nonmoving --way=nonmoving_thr --way=nonmoving_thr_sanity -e config.timeout+=config.timeout+config.timeout+config.timeout+config.timeout",
    
    7066 7066
           "TEST_ENV": "x86_64-linux-deb13-validate+boot_nonmoving_gc",
    
    7067 7067
           "TEST_WAYS": ""
    
    7068 7068
         }
    
    ... ... @@ -7128,7 +7128,7 @@
    7128 7128
           "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    7129 7129
           "IGNORE_PERF_FAILURES": "all",
    
    7130 7130
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    7131
    -      "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout",
    
    7131
    +      "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout+config.timeout+config.timeout",
    
    7132 7132
           "TEST_ENV": "x86_64-linux-deb13-validate+llvm",
    
    7133 7133
           "TEST_WAYS": "llvm optllvm"
    
    7134 7134
         }
    
    ... ... @@ -7196,7 +7196,7 @@
    7196 7196
           "HADRIAN_ARGS": "--docs=none",
    
    7197 7197
           "IGNORE_PERF_FAILURES": "all",
    
    7198 7198
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    7199
    -      "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout",
    
    7199
    +      "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout+config.timeout+config.timeout",
    
    7200 7200
           "TEST_ENV": "x86_64-linux-deb13-validate+thread_sanitizer_cmm",
    
    7201 7201
           "TEST_WAYS": "",
    
    7202 7202
           "TSAN_OPTIONS": "suppressions=$CI_PROJECT_DIR/rts/.tsan-suppressions"
    
    ... ... @@ -7263,7 +7263,7 @@
    7263 7263
           "CONFIGURE_ARGS": "--enable-ipe-data-compression --enable-strict-ghc-toolchain-check",
    
    7264 7264
           "IGNORE_PERF_FAILURES": "all",
    
    7265 7265
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    7266
    -      "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout",
    
    7266
    +      "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout+config.timeout+config.timeout",
    
    7267 7267
           "TEST_ENV": "x86_64-linux-deb13-zstd-validate",
    
    7268 7268
           "TEST_WAYS": ""
    
    7269 7269
         }
    
    ... ... @@ -7329,7 +7329,7 @@
    7329 7329
           "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    7330 7330
           "IGNORE_PERF_FAILURES": "all",
    
    7331 7331
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    7332
    -      "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout",
    
    7332
    +      "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout+config.timeout+config.timeout",
    
    7333 7333
           "TEST_ENV": "x86_64-linux-fedora43-release",
    
    7334 7334
           "TEST_WAYS": ""
    
    7335 7335
         }
    
    ... ... @@ -7396,7 +7396,7 @@
    7396 7396
           "HADRIAN_ARGS": "--haddock-for-hackage",
    
    7397 7397
           "IGNORE_PERF_FAILURES": "all",
    
    7398 7398
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    7399
    -      "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout",
    
    7399
    +      "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout+config.timeout+config.timeout",
    
    7400 7400
           "TEST_ENV": "x86_64-linux-fedora43-release",
    
    7401 7401
           "TEST_WAYS": ""
    
    7402 7402
         }
    
    ... ... @@ -7462,7 +7462,7 @@
    7462 7462
           "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    7463 7463
           "IGNORE_PERF_FAILURES": "all",
    
    7464 7464
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    7465
    -      "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout",
    
    7465
    +      "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout+config.timeout+config.timeout",
    
    7466 7466
           "TEST_ENV": "x86_64-linux-fedora43-validate",
    
    7467 7467
           "TEST_WAYS": ""
    
    7468 7468
         }
    
    ... ... @@ -7528,7 +7528,7 @@
    7528 7528
           "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    7529 7529
           "IGNORE_PERF_FAILURES": "all",
    
    7530 7530
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    7531
    -      "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout",
    
    7531
    +      "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout+config.timeout+config.timeout",
    
    7532 7532
           "TEST_ENV": "x86_64-linux-fedora43-validate+debug_info",
    
    7533 7533
           "TEST_WAYS": ""
    
    7534 7534
         }
    
    ... ... @@ -7595,7 +7595,7 @@
    7595 7595
           "HADRIAN_ARGS": "--docs=none",
    
    7596 7596
           "IGNORE_PERF_FAILURES": "all",
    
    7597 7597
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    7598
    -      "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout",
    
    7598
    +      "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout+config.timeout+config.timeout",
    
    7599 7599
           "TEST_ENV": "x86_64-linux-fedora43-validate+debug_info+ubsan",
    
    7600 7600
           "TEST_WAYS": "",
    
    7601 7601
           "UBSAN_OPTIONS": "suppressions=$CI_PROJECT_DIR/rts/.ubsan-suppressions"
    
    ... ... @@ -7662,7 +7662,7 @@
    7662 7662
           "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    7663 7663
           "IGNORE_PERF_FAILURES": "all",
    
    7664 7664
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    7665
    -      "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout",
    
    7665
    +      "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout+config.timeout+config.timeout",
    
    7666 7666
           "TEST_ENV": "x86_64-linux-rocky8-validate",
    
    7667 7667
           "TEST_WAYS": ""
    
    7668 7668
         }
    
    ... ... @@ -7728,7 +7728,7 @@
    7728 7728
           "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    7729 7729
           "IGNORE_PERF_FAILURES": "all",
    
    7730 7730
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    7731
    -      "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout",
    
    7731
    +      "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout+config.timeout+config.timeout",
    
    7732 7732
           "TEST_ENV": "x86_64-linux-ubuntu22_04-validate",
    
    7733 7733
           "TEST_WAYS": ""
    
    7734 7734
         }
    
    ... ... @@ -7797,7 +7797,7 @@
    7797 7797
           "CROSS_TARGET": "loongarch64-linux-gnu",
    
    7798 7798
           "IGNORE_PERF_FAILURES": "all",
    
    7799 7799
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    7800
    -      "RUNTEST_ARGS": "-e config.timeout=900 -e config.timeout+=config.timeout+config.timeout",
    
    7800
    +      "RUNTEST_ARGS": "-e config.timeout=900 -e config.timeout+=config.timeout+config.timeout+config.timeout+config.timeout",
    
    7801 7801
           "TEST_ENV": "x86_64-linux-ubuntu24_04-loongarch-cross_loongarch64-linux-gnu-validate",
    
    7802 7802
           "TEST_WAYS": ""
    
    7803 7803
         }
    
    ... ... @@ -7863,7 +7863,7 @@
    7863 7863
           "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    7864 7864
           "IGNORE_PERF_FAILURES": "all",
    
    7865 7865
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    7866
    -      "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout",
    
    7866
    +      "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout+config.timeout+config.timeout",
    
    7867 7867
           "TEST_ENV": "x86_64-linux-ubuntu24_04-validate",
    
    7868 7868
           "TEST_WAYS": ""
    
    7869 7869
         }
    
    ... ... @@ -7929,7 +7929,7 @@
    7929 7929
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    7930 7930
           "LANG": "en_US.UTF-8",
    
    7931 7931
           "MSYSTEM": "CLANG64",
    
    7932
    -      "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout",
    
    7932
    +      "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout+config.timeout+config.timeout",
    
    7933 7933
           "TEST_ENV": "x86_64-windows-int_native-validate",
    
    7934 7934
           "TEST_WAYS": ""
    
    7935 7935
         }
    
    ... ... @@ -7995,7 +7995,7 @@
    7995 7995
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    7996 7996
           "LANG": "en_US.UTF-8",
    
    7997 7997
           "MSYSTEM": "CLANG64",
    
    7998
    -      "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout",
    
    7998
    +      "RUNTEST_ARGS": " -e config.timeout+=config.timeout+config.timeout+config.timeout+config.timeout",
    
    7999 7999
           "TEST_ENV": "x86_64-windows-validate",
    
    8000 8000
           "TEST_WAYS": ""
    
    8001 8001
         }