Skip to content

Commit cab53c6

Browse files
committed
Bump Cabal version for tests; change port in TCP test to 0
1 parent fa3b7a8 commit cab53c6

3 files changed

Lines changed: 12 additions & 4 deletions

File tree

distributed-process-tests/distributed-process-tests.cabal

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Maintainer: Tim Watson <watson.timothy@gmail.com>
1010
copyright: Well-Typed LLP
1111
category: Control, Cloud Haskell
1212
build-type: Simple
13-
cabal-version: >=1.8
13+
cabal-version: >=1.10
1414

1515
flag tcp
1616
Description: build and run TCP tests
@@ -42,6 +42,7 @@ library
4242
test-framework-hunit >= 0.2.0 && < 0.4,
4343
stm
4444
hs-source-dirs: src
45+
default-language: Haskell98
4546
ghc-options: -Wall -fno-warn-unused-do-bind
4647
extensions: CPP,
4748
ExistentialQuantification,
@@ -66,6 +67,7 @@ Test-Suite TestCHInMemory
6667
network-transport-inmemory >= 0.5,
6768
test-framework >= 0.6 && < 0.9
6869
Extensions: CPP
70+
default-language: Haskell98
6971
ghc-options: -Wall -threaded -rtsopts -with-rtsopts=-N -fno-warn-unused-do-bind
7072
HS-Source-Dirs: tests
7173

@@ -83,6 +85,7 @@ Test-Suite TestCHInTCP
8385
else
8486
Buildable: False
8587
Extensions: CPP
88+
default-language: Haskell98
8689
ghc-options: -Wall -threaded -rtsopts -with-rtsopts=-N -fno-warn-unused-do-bind
8790
HS-Source-Dirs: tests
8891

@@ -98,6 +101,7 @@ Test-Suite TestClosure
98101
network-transport-inmemory >= 0.5,
99102
test-framework >= 0.6 && < 0.9
100103
Extensions: CPP
104+
default-language: Haskell98
101105
ghc-options: -Wall -threaded -rtsopts -with-rtsopts=-N -fno-warn-unused-do-bind
102106
HS-Source-Dirs: tests
103107

@@ -112,6 +116,7 @@ Test-Suite TestStats
112116
network-transport-inmemory >= 0.5,
113117
test-framework >= 0.6 && < 0.9
114118
Extensions: CPP
119+
default-language: Haskell98
115120
ghc-options: -Wall -threaded -rtsopts -with-rtsopts=-N -fno-warn-unused-do-bind
116121
HS-Source-Dirs: tests
117122

@@ -126,6 +131,7 @@ Test-Suite TestMxInMemory
126131
network-transport-inmemory >= 0.5,
127132
test-framework >= 0.6 && < 0.9
128133
Extensions: CPP
134+
default-language: Haskell98
129135
ghc-options: -threaded -rtsopts -with-rtsopts=-N -fno-warn-unused-do-bind
130136
HS-Source-Dirs: tests
131137

@@ -140,6 +146,7 @@ Test-Suite TestTracingInMemory
140146
network-transport-inmemory >= 0.5,
141147
test-framework >= 0.6 && < 0.9
142148
Extensions: CPP
149+
default-language: Haskell98
143150
ghc-options: -threaded -rtsopts -with-rtsopts=-N -fno-warn-unused-do-bind
144151
HS-Source-Dirs: tests
145152

@@ -154,5 +161,6 @@ Test-Suite TestMxInTCP
154161
network-transport-inmemory >= 0.5,
155162
test-framework >= 0.6 && < 0.9
156163
Extensions: CPP
164+
default-language: Haskell98
157165
ghc-options: -Wall -threaded -rtsopts -with-rtsopts=-N -fno-warn-unused-do-bind
158166
HS-Source-Dirs: tests

distributed-process-tests/src/Control/Distributed/Process/Tests/Internal/Utils.hs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,8 +188,8 @@ newLogger = do
188188
_ <- forkIO $ logger q
189189
return $ Logger tid q
190190
where logger q' = forever $ do
191-
msg <- atomically $ readTQueue q'
192-
putStrLn msg
191+
msg <- atomically $ readTQueue q'
192+
putStrLn msg
193193

194194
-- | Send a message to the Logger
195195
putLogMsg :: Logger -> String -> Process ()

distributed-process-tests/tests/runTCP.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ main = do
2525
hSetBuffering stdout LineBuffering
2626
hSetBuffering stderr LineBuffering
2727
Right (transport, internals) <-
28-
createTransportExposeInternals (defaultTCPAddr "127.0.0.1" "8080")
28+
createTransportExposeInternals (defaultTCPAddr "127.0.0.1" "0")
2929
defaultTCPParameters { transportConnectTimeout = Just 3000000 }
3030
ts <- tests TestTransport
3131
{ testTransport = transport

0 commit comments

Comments
 (0)