File tree Expand file tree Collapse file tree 3 files changed +4
-4
lines changed Expand file tree Collapse file tree 3 files changed +4
-4
lines changed Original file line number Diff line number Diff line change @@ -208,7 +208,6 @@ jobs:
208208 run : sh validate.sh $FLAGS -s cli-tests
209209
210210 - name : Validate cli-suite
211- if : runner.os != 'Windows'
212211 run : sh validate.sh $FLAGS -s cli-suite
213212
214213 - name : Validate solver-benchmarks-tests
Original file line number Diff line number Diff line change @@ -90,7 +90,7 @@ executable cabal-tests
9090 import : shared
9191 main-is : cabal-tests.hs
9292 hs-source-dirs : main
93- ghc-options : -threaded
93+ ghc-options : -threaded -rtsopts
9494 -- Make sure these are built before the executable is run
9595 build-tool-depends : cabal-testsuite :test-runtime-deps
9696 build-depends :
Original file line number Diff line number Diff line change @@ -347,6 +347,7 @@ doctest: $DOCTEST
347347benchmarks: $BENCHMARKS
348348verbose: $VERBOSE
349349extra compilers: $EXTRAHCS
350+ extra RTS options: $RTSOPTS
350351
351352EOF
352353}
433434step_lib_suite () {
434435print_header " Cabal: cabal-testsuite"
435436
436- 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 "
437438(cd cabal-testsuite && timed $CMD ) || exit 1
438439}
439440
@@ -475,7 +476,7 @@ CMD="$($CABALLISTBIN cabal-install:test:integration-tests2) -j1 --hide-successes
475476step_cli_suite () {
476477print_header " cabal-install: cabal-testsuite"
477478
478- 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 "
479480(cd cabal-testsuite && timed $CMD ) || exit 1
480481}
481482
You can’t perform that action at this time.
0 commit comments