Skip to content

Commit

Permalink
#538, make sure processes can be killed properly
Browse files Browse the repository at this point in the history
  • Loading branch information
ndmitchell committed Oct 16, 2017
1 parent 5871479 commit 2bcbeb3
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
1 change: 1 addition & 0 deletions CHANGES.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
Changelog for Shake

#538, make sure processes can be killed properly
#502, add needHasChanged to track what in a need has changed
Weaken the typeclasses required for apply/apply1
#502, add batch function to batch commands with high startup
Expand Down
3 changes: 1 addition & 2 deletions src/Test/Command.hs
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,7 @@ main = shakeTest_ test $ do
when (exit == ExitSuccess) $ error "== ExitSuccess"
when (t < 2 || t > 8) $ error $ "failed to timeout, took " ++ show t

-- #538, a bug, but disabled as #538 is broken
when False $ "timeout2" !> do
"timeout2" !> do
offset <- liftIO offsetTime
liftIO $ timeout 2 $ cmd_ helper "w20"
t <- liftIO offset
Expand Down

0 comments on commit 2bcbeb3

Please sign in to comment.