Skip to content

Commit 252e34a

Browse files
jasagredoMikolaj
authored andcommitted
Use --io-manager=native in lib-suite on Windows
(cherry picked from commit a562b57)
1 parent b477def commit 252e34a

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

.github/workflows/validate.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff 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

cabal-testsuite/cabal-testsuite.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff 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:

validate.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -347,6 +347,7 @@ doctest: $DOCTEST
347347
benchmarks: $BENCHMARKS
348348
verbose: $VERBOSE
349349
extra compilers: $EXTRAHCS
350+
extra RTS options: $RTSOPTS
350351
351352
EOF
352353
}
@@ -433,7 +434,7 @@ fi
433434
step_lib_suite() {
434435
print_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
475476
step_cli_suite() {
476477
print_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

0 commit comments

Comments
 (0)