Skip to content

Commit

Permalink
Use --io-manager=native in lib-suite on Windows
Browse files Browse the repository at this point in the history
  • Loading branch information
jasagredo committed Jun 17, 2024
1 parent e1f73a4 commit ed0cac8
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
2 changes: 2 additions & 0 deletions cabal-testsuite/cabal-testsuite.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,8 @@ executable cabal-tests
main-is: cabal-tests.hs
hs-source-dirs: main
ghc-options: -threaded
if os(windows)
ghc-options: -rtsopts
-- Make sure these are built before the executable is run
build-tool-depends: cabal-testsuite:test-runtime-deps
build-depends:
Expand Down
7 changes: 5 additions & 2 deletions validate.sh
Original file line number Diff line number Diff line change
Expand Up @@ -324,6 +324,8 @@ CABAL_TESTSUITE_BDIR="$(pwd)/$BUILDDIR/build/$ARCH/$BASEHC/cabal-testsuite-3"
CABALNEWBUILD="${CABAL} build $JOBS -w $HC --builddir=$BUILDDIR --project-file=$PROJECTFILE"
CABALLISTBIN="${CABAL} list-bin --builddir=$BUILDDIR --project-file=$PROJECTFILE"

RTSOPTS="$([[ $ARCH = "x86_64-windows" ]] && echo "+RTS --io-manager=native" || echo "")"

# header
#######################################################################

Expand All @@ -344,6 +346,7 @@ doctest: $DOCTEST
benchmarks: $BENCHMARKS
verbose: $VERBOSE
extra compilers: $EXTRAHCS
extra RTS options: $RTSOPTS
EOF
}
Expand Down Expand Up @@ -426,7 +429,7 @@ fi
step_lib_suite() {
print_header "Cabal: cabal-testsuite"

CMD="$($CABALLISTBIN cabal-testsuite:exe:cabal-tests) --builddir=$CABAL_TESTSUITE_BDIR $TESTSUITEJOBS --with-ghc=$HC --hide-successes"
CMD="$($CABALLISTBIN cabal-testsuite:exe:cabal-tests) --builddir=$CABAL_TESTSUITE_BDIR $TESTSUITEJOBS --with-ghc=$HC --hide-successes $RTSOPTS"
(cd cabal-testsuite && timed $CMD) || exit 1
}

Expand Down Expand Up @@ -468,7 +471,7 @@ CMD="$($CABALLISTBIN cabal-install:test:integration-tests2) -j1 --hide-successes
step_cli_suite() {
print_header "cabal-install: cabal-testsuite"

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"
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"
(cd cabal-testsuite && timed $CMD) || exit 1
}

Expand Down

0 comments on commit ed0cac8

Please sign in to comment.