Skip to content

Commit

Permalink
Merge pull request #10344 from haskell/mergify/bp/3.12/pr-10114
Browse files Browse the repository at this point in the history
Use `--io-manager=native` in `lib-suite` on Windows (backport #10114)
  • Loading branch information
mergify[bot] authored Sep 14, 2024
2 parents b477def + 252e34a commit c0a5615
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
1 change: 0 additions & 1 deletion .github/workflows/validate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,6 @@ jobs:
run: sh validate.sh $FLAGS -s cli-tests

- name: Validate cli-suite
if: runner.os != 'Windows'
run: sh validate.sh $FLAGS -s cli-suite

- name: Validate solver-benchmarks-tests
Expand Down
2 changes: 1 addition & 1 deletion cabal-testsuite/cabal-testsuite.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ executable cabal-tests
import: shared
main-is: cabal-tests.hs
hs-source-dirs: main
ghc-options: -threaded
ghc-options: -threaded -rtsopts
-- Make sure these are built before the executable is run
build-tool-depends: cabal-testsuite:test-runtime-deps
build-depends:
Expand Down
5 changes: 3 additions & 2 deletions validate.sh
Original file line number Diff line number Diff line change
Expand Up @@ -347,6 +347,7 @@ doctest: $DOCTEST
benchmarks: $BENCHMARKS
verbose: $VERBOSE
extra compilers: $EXTRAHCS
extra RTS options: $RTSOPTS
EOF
}
Expand Down Expand Up @@ -433,7 +434,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 @@ -475,7 +476,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 c0a5615

Please sign in to comment.