File tree Expand file tree Collapse file tree 2 files changed +7
-2
lines changed Expand file tree Collapse file tree 2 files changed +7
-2
lines changed Original file line number Diff line number Diff line change @@ -92,6 +92,8 @@ executable cabal-tests
9292 main-is : cabal-tests.hs
9393 hs-source-dirs : main
9494 ghc-options : -threaded
95+ if os(windows)
96+ ghc-options : -rtsopts
9597 -- Make sure these are built before the executable is run
9698 build-tool-depends : cabal-testsuite :test-runtime-deps
9799 build-depends :
Original file line number Diff line number Diff line change @@ -324,6 +324,8 @@ 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+ RTSOPTS=" $( [[ $ARCH = " x86_64-windows" ]] && echo " +RTS --io-manager=native" || echo " " ) "
328+
327329# header
328330# ######################################################################
329331
@@ -344,6 +346,7 @@ doctest: $DOCTEST
344346benchmarks: $BENCHMARKS
345347verbose: $VERBOSE
346348extra compilers: $EXTRAHCS
349+ extra RTS options: $RTSOPTS
347350
348351EOF
349352}
426429step_lib_suite () {
427430print_header " Cabal: cabal-testsuite"
428431
429- CMD=" $( $CABALLISTBIN cabal-testsuite:exe:cabal-tests) --builddir=$CABAL_TESTSUITE_BDIR $TESTSUITEJOBS --with-ghc=$HC --hide-successes"
432+ CMD=" $( $CABALLISTBIN cabal-testsuite:exe:cabal-tests) --builddir=$CABAL_TESTSUITE_BDIR $TESTSUITEJOBS --with-ghc=$HC --hide-successes $RTSOPTS "
430433(cd cabal-testsuite && timed $CMD ) || exit 1
431434}
432435
@@ -468,7 +471,7 @@ CMD="$($CABALLISTBIN cabal-install:test:integration-tests2) -j1 --hide-successes
468471step_cli_suite () {
469472print_header " cabal-install: cabal-testsuite"
470473
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"
474+ 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 "
472475(cd cabal-testsuite && timed $CMD ) || exit 1
473476}
474477
You can’t perform that action at this time.
0 commit comments