diff options
| author | Rickard Green <[email protected]> | 2011-12-06 19:57:03 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2011-12-06 19:57:03 +0100 |
| commit | 54ec1e2ccc3fd9d61be6a66db807d8a7567c2313 (patch) | |
| tree | b121a3dd9324930e493cdc028ca1468264f891aa /erts | |
| parent | 043d670abaa83ab5b368228d2ac8dd0b2751768f (diff) | |
| parent | 6d5f040677687eca9ddfc52f329f8ad8655129ea (diff) | |
| download | otp-54ec1e2ccc3fd9d61be6a66db807d8a7567c2313.tar.gz otp-54ec1e2ccc3fd9d61be6a66db807d8a7567c2313.tar.bz2 otp-54ec1e2ccc3fd9d61be6a66db807d8a7567c2313.zip | |
Merge branch 'rickard/test-fixes-r15b'
* rickard/test-fixes-r15b:
Unlink test-proc instead of ensuring that it has died before stopping node
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/emulator/test/scheduler_SUITE.erl | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/erts/emulator/test/scheduler_SUITE.erl b/erts/emulator/test/scheduler_SUITE.erl index c7ec3cbe41..8931562828 100644 --- a/erts/emulator/test/scheduler_SUITE.erl +++ b/erts/emulator/test/scheduler_SUITE.erl @@ -527,14 +527,10 @@ bindings(Node, BindType) -> BindType})), Parent ! {Ref, Res} end), - Mon = erlang:monitor(process, Pid), - receive - {'DOWN', Mon, _, _, _} -> - ok - end, receive {Ref, Res} -> ?t:format("~p: ~p~n", [BindType, Res]), + unlink(Pid), Res end. |