Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
GHC
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Reinier Maas
GHC
Commits
bafd615e
Commit
bafd615e
authored
8 years ago
by
Thomas Miedema
Browse files
Options
Downloads
Patches
Plain Diff
Testsuite: do not print timeout message
This is a followup to
e1293bbf
, but then for Windows timeout.
parent
206b4a1d
Loading
Loading
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
testsuite/timeout/timeout.hs
+1
-6
1 addition, 6 deletions
testsuite/timeout/timeout.hs
with
1 addition
and
6 deletions
testsuite/timeout/timeout.hs
+
1
−
6
View file @
bafd615e
...
...
@@ -33,9 +33,6 @@ main = do
_
->
die
(
"Can't parse "
++
show
secs
++
" as a number of seconds"
)
_
->
die
(
"Bad arguments "
++
show
args
)
timeoutMsg
::
String
->
String
timeoutMsg
cmd
=
"Timeout happened...killing process "
++
cmd
++
"..."
run
::
Int
->
String
->
IO
()
#
if
!
defined
(
mingw32_HOST_OS
)
run
secs
cmd
=
do
...
...
@@ -61,7 +58,6 @@ run secs cmd = do
r
<-
takeMVar
m
case
r
of
Nothing
->
do
hPutStrLn
stderr
(
timeoutMsg
cmd
)
killProcess
pid
exitWith
(
ExitFailure
99
)
Just
(
Exited
r
)
->
exitWith
r
...
...
@@ -122,8 +118,7 @@ run secs cmd =
let
millisecs
=
secs
*
1000
rc
<-
waitForSingleObject
handle
(
fromIntegral
millisecs
)
if
rc
==
cWAIT_TIMEOUT
then
do
hPutStrLn
stderr
(
timeoutMsg
cmd
)
terminateJobObject
job
99
then
do
terminateJobObject
job
99
exitWith
(
ExitFailure
99
)
else
alloca
$
\
p_exitCode
->
do
r
<-
getExitCodeProcess
handle
p_exitCode
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment