Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC

Commits:

3 changed files:

Changes:

  • .gitlab/generate-ci/gen_ci.hs
    ... ... @@ -489,7 +489,6 @@ alpineVariables arch = mconcat $
    489 489
       [ mconcat [ brokenTest test "#25498" | test <- ["simd009", "T25169"] ]
    
    490 490
       | I386 <- [arch]
    
    491 491
       ] ++
    
    492
    -  [ brokenTest "T22033" "#25497" | I386 <- [arch] ] ++
    
    493 492
       [ -- Bootstrap compiler has incorrectly configured target triple #25200
    
    494 493
         "CONFIGURE_ARGS" =: "--enable-ignore-build-platform-mismatch --build=aarch64-unknown-linux --host=aarch64-unknown-linux --target=aarch64-unknown-linux"
    
    495 494
       | AArch64 <- [arch]
    

  • .gitlab/jobs.yaml
    ... ... @@ -532,7 +532,7 @@
    532 532
         "variables": {
    
    533 533
           "BIGNUM_BACKEND": "gmp",
    
    534 534
           "BIN_DIST_NAME": "ghc-i386-linux-alpine3_22-validate",
    
    535
    -      "BROKEN_TESTS": "encoding004 T10458 simd009 T25169 T22033",
    
    535
    +      "BROKEN_TESTS": "encoding004 T10458 simd009 T25169",
    
    536 536
           "BUILD_FLAVOUR": "validate",
    
    537 537
           "CONFIGURE_ARGS": "--disable-ld-override --enable-strict-ghc-toolchain-check",
    
    538 538
           "INSTALL_CONFIGURE_ARGS": "--disable-ld-override --enable-strict-ghc-toolchain-check",
    
    ... ... @@ -1203,7 +1203,7 @@
    1203 1203
         "variables": {
    
    1204 1204
           "BIGNUM_BACKEND": "gmp",
    
    1205 1205
           "BIN_DIST_NAME": "ghc-i386-linux-alpine3_22-validate",
    
    1206
    -      "BROKEN_TESTS": "encoding004 T10458 simd009 T25169 T22033",
    
    1206
    +      "BROKEN_TESTS": "encoding004 T10458 simd009 T25169",
    
    1207 1207
           "BUILD_FLAVOUR": "validate",
    
    1208 1208
           "CONFIGURE_ARGS": "--disable-ld-override --enable-strict-ghc-toolchain-check",
    
    1209 1209
           "INSTALL_CONFIGURE_ARGS": "--disable-ld-override --enable-strict-ghc-toolchain-check",
    
    ... ... @@ -4017,7 +4017,7 @@
    4017 4017
         "variables": {
    
    4018 4018
           "BIGNUM_BACKEND": "gmp",
    
    4019 4019
           "BIN_DIST_NAME": "ghc-i386-linux-alpine3_22-release+no_split_sections",
    
    4020
    -      "BROKEN_TESTS": "encoding004 T10458 simd009 T25169 T22033",
    
    4020
    +      "BROKEN_TESTS": "encoding004 T10458 simd009 T25169",
    
    4021 4021
           "BUILD_FLAVOUR": "release+no_split_sections",
    
    4022 4022
           "CONFIGURE_ARGS": "--disable-ld-override --enable-strict-ghc-toolchain-check",
    
    4023 4023
           "IGNORE_PERF_FAILURES": "all",
    

  • testsuite/tests/llvm/should_run/all.T
    ... ... @@ -14,7 +14,7 @@ def ignore_llvm_and_vortex( msg ):
    14 14
     
    
    15 15
     test('T25770', [normal, normalise_errmsg_fun(ignore_llvm_and_vortex)], compile_and_run, [''])
    
    16 16
     test('T22487', [normal, normalise_errmsg_fun(ignore_llvm_and_vortex)], compile_and_run, [''])
    
    17
    -test('T22033', [normal, normalise_errmsg_fun(ignore_llvm_and_vortex)], compile_and_run, [''])
    
    17
    +test('T22033', [normal, unless(wordsize(64), skip), normalise_errmsg_fun(ignore_llvm_and_vortex)], compile_and_run, [''])
    
    18 18
     test('T25730', [req_c, unless(arch('x86_64'), skip), normalise_errmsg_fun(ignore_llvm_and_vortex)], compile_and_run, ['T25730C.c'])
    
    19 19
       # T25730C.c contains Intel instrinsics, so only run this test on x86
    
    20 20
     test('T20645', [normal, normalise_errmsg_fun(ignore_llvm_and_vortex), when(have_llvm(), extra_ways(["optllvm"]))], compile_and_run, [''])