Skip to content

Commit 5c6e548

Browse files
jasagredoMikolaj
authored andcommitted
Use --io-manager=native in lib-suite on Windows
1 parent 315e3f3 commit 5c6e548

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

cabal-testsuite/cabal-testsuite.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ executable cabal-tests
9191
import: shared
9292
main-is: cabal-tests.hs
9393
hs-source-dirs: main
94-
ghc-options: -threaded
94+
ghc-options: -threaded -rtsopts
9595
-- Make sure these are built before the executable is run
9696
build-tool-depends: cabal-testsuite:test-runtime-deps
9797
build-depends:

validate.sh

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -324,6 +324,13 @@ CABAL_TESTSUITE_BDIR="$(pwd)/$BUILDDIR/build/$ARCH/$BASEHC/cabal-testsuite-3"
324324
CABALNEWBUILD="${CABAL} build $JOBS -w $HC --builddir=$BUILDDIR --project-file=$PROJECTFILE"
325325
CABALLISTBIN="${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
344351
benchmarks: $BENCHMARKS
345352
verbose: $VERBOSE
346353
extra compilers: $EXTRAHCS
354+
extra RTS options: $RTSOPTS
347355
348356
EOF
349357
}
@@ -426,7 +434,7 @@ fi
426434
step_lib_suite() {
427435
print_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
468476
step_cli_suite() {
469477
print_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

Comments
 (0)