@@ -324,6 +324,13 @@ CABAL_TESTSUITE_BDIR="$(pwd)/$BUILDDIR/build/$ARCH/$BASEHC/cabal-testsuite-3"
324324CABALNEWBUILD=" ${CABAL} build $JOBS -w $HC --builddir=$BUILDDIR --project-file=$PROJECTFILE "
325325CABALLISTBIN=" ${CABAL} list-bin --builddir=$BUILDDIR --project-file=$PROJECTFILE "
326326
327+ # This was needed in some local Windows MSYS2 environments
328+ # but breaks CI for Windows + GHC 9.0.2, thus it is set only on non-CI executions
329+ # of validate.sh
330+ # https://github.com/haskell/cabal/issues/9571
331+ # https://github.com/haskell/cabal/pull/10114
332+ RTSOPTS=" $( [[ $ARCH = " x86_64-windows" && -z " $CI " ]] && echo " +RTS --io-manager=native" || echo " " ) "
333+
327334# header
328335# ######################################################################
329336
@@ -344,6 +351,7 @@ doctest: $DOCTEST
344351benchmarks: $BENCHMARKS
345352verbose: $VERBOSE
346353extra compilers: $EXTRAHCS
354+ extra RTS options: $RTSOPTS
347355
348356EOF
349357}
426434step_lib_suite () {
427435print_header " Cabal: cabal-testsuite"
428436
429- CMD=" $( $CABALLISTBIN cabal-testsuite:exe:cabal-tests) --builddir=$CABAL_TESTSUITE_BDIR $TESTSUITEJOBS --with-ghc=$HC --hide-successes"
437+ CMD=" $( $CABALLISTBIN cabal-testsuite:exe:cabal-tests) --builddir=$CABAL_TESTSUITE_BDIR $TESTSUITEJOBS --with-ghc=$HC --hide-successes $RTSOPTS "
430438(cd cabal-testsuite && timed $CMD ) || exit 1
431439}
432440
@@ -468,7 +476,7 @@ CMD="$($CABALLISTBIN cabal-install:test:integration-tests2) -j1 --hide-successes
468476step_cli_suite () {
469477print_header " cabal-install: cabal-testsuite"
470478
471- CMD=" $( $CABALLISTBIN cabal-testsuite:exe:cabal-tests) --builddir=$CABAL_TESTSUITE_BDIR --with-cabal=$( $CABALLISTBIN cabal-install:exe:cabal) $TESTSUITEJOBS --with-ghc=$HC --hide-successes --intree-cabal-lib=$PWD --test-tmp=$PWD /testdb"
479+ CMD=" $( $CABALLISTBIN cabal-testsuite:exe:cabal-tests) --builddir=$CABAL_TESTSUITE_BDIR --with-cabal=$( $CABALLISTBIN cabal-install:exe:cabal) $TESTSUITEJOBS --with-ghc=$HC --hide-successes --intree-cabal-lib=$PWD --test-tmp=$PWD /testdb $RTSOPTS "
472480(cd cabal-testsuite && timed $CMD ) || exit 1
473481}
474482
0 commit comments