git.iko.soy/streamly
on master help sign in
Use non-threaded runtime for network tests on windows
aaa1161Ranjeet Kumar Ranjan
core/streamly-core.cabal+1−1
compare with master
unifiedsplit
@@ -475,4 +475,4 @@ library
475 build-depends: unix >= 2.7.0 && < 2.9
475 build-depends: unix >= 2.7.0 && < 2.9
476
476
477 if os(windows)
477 if os(windows)
478− build-depends: Win32 >= 2.6 && < 2.13
478+ build-depends: Win32 >= 2.6 && < 2.14
test/streamly-tests.cabal+14−12
@@ -365,28 +365,30 @@ test-suite FileSystem.Handle
365 buildable: False
365 buildable: False
366
366
367test-suite Network.Inet.TCP
367test-suite Network.Inet.TCP
368− import: test-options
368+ import: lib-options
369 type: exitcode-stdio-1.0
369 type: exitcode-stdio-1.0
370 main-is: Streamly/Test/Network/Inet/TCP.hs
370 main-is: Streamly/Test/Network/Inet/TCP.hs
371+ ghc-options: -rtsopts -fno-ignore-asserts
372+ include-dirs: .
373+ build-depends: streamly-tests
374+ -- Cannot killThread in listen/accept on Windows threaded runtime
375+ if !os(windows)
376+ ghc-options: -threaded -with-rtsopts=-N
371 if flag(use-streamly-core)
377 if flag(use-streamly-core)
372 buildable: False
378 buildable: False
373− -- XXX on Windows these test cases are hanging for ever
374− -- need to be investigated.
375− -- https://github.com/composewell/streamly/issues/2315
376− if os(windows)
377− buildable: False
378
379
379test-suite Network.Socket
380test-suite Network.Socket
380− import: test-options
381+ import: lib-options
381 type: exitcode-stdio-1.0
382 type: exitcode-stdio-1.0
382 main-is: Streamly/Test/Network/Socket.hs
383 main-is: Streamly/Test/Network/Socket.hs
384+ ghc-options: -rtsopts -fno-ignore-asserts
385+ include-dirs: .
386+ build-depends: streamly-tests
387+ -- Cannot killThread in listen/accept on Windows threaded runtime
388+ if !os(windows)
389+ ghc-options: -threaded -with-rtsopts=-N
383 if flag(use-streamly-core)
390 if flag(use-streamly-core)
384 buildable: False
391 buildable: False
385− -- XXX on Windows these test cases are hanging for ever
386− -- need to be investigated.
387− -- https://github.com/composewell/streamly/issues/2315
388− if os(windows)
389− buildable: False
390
392
391test-suite Prelude
393test-suite Prelude
392 import: test-options
394 import: test-options